merge - Revert 'MediaPlayer: Add Movieplayer infobar'
merge - MediaPlayer: Reintroduce InfoBar on MediaPlayer
merge - MoviePlayer: Remove some not required code
merge - MediaPlayer: Stop timeout once the InfoBar was toggled
merge - ServiceName: Try to fix the <n/a> GSOD issue
merge - GMEPG and ChannelSelection, ServiceEvent -> Service.
merge - MediaPlayer: Remove more not required code
merge - Navigation: Continue playing old service when incorrect PIN
merge - Not goto current service when going to userbouquet
merge - UsageConfig: use the same range for all subtitle delay settings
merge - GetEcmInfo finetuning parsing of statusfile.
merge - ChannelSelection: Skin support for Editmode and EditReference
merge - ChannelSelection: Add support for the Event source.
merge - EventView: Add support for Service and Event sources.
merge - EventView: Add support for FullDescription
merge - InfoBar/InfoBarGenerics: Enable TIMER Button on RemoteControl
merge - servicedvb: allow timeshift on radio services
merge - tstools: calcEnd corrections
merge -
merge - Protect timeshift at least during normal zapping