merge -  Add screensaver to mediaplayer
merge - ScanSetup: Fix copy and past related typo
merge - Fix for http stream URLs and redirecting
merge - servicedvb: allow timeshift to be started on an http ts stream
merge - fix for restore service on exit satfinder
merge - Add timeframe option were inactivity timer is ignored
merge - Ensure that inactivity timer will not be initialize by zero
merge - SleepTimerEdit: Hide configs that do not have effect
merge - Streamline inactivity timer blok time handling
merge - InfoBarGenerics: Fix self.timeshift_enabled flag for some cases.
merge - InfoBarGenerics: Slightly streamline the previous commit
merge - Stop shadowing enable_timeshift in python
merge - Fix stopping timeshift when stopping with stop button
merge - ScreenSaver: Do not close when new started service is an audio service
merge - MediaPlayer: Use the central AUDIO_EXTENTIONS from MovieList
merge - MediaPlayer: Show InfoBar when required after seeking
merge - Fix eDVBPVRServiceOfflineOperations::reindex()
BouquetHotkeys: fix crash
merge - Re-enable subtitles in case timeshift state is changed
merge - Fix playback of MKVs with subtitles enabled