Merge pull request #1936 from jellyfin/jf-1925-livetv-for-2.1.z

Merge pull request #1936 from jellyfin/jf-1925-livetv-for-2.1.z #2223