Zap timer over-ridden on exit from media browser

[prl]

If a zap timer starts when in the media browser (from live TV, MEDIA), the service showing in the background changes to the zap timer channel, but when the media browser exits, the channel changes back to the live TV channel that was playing when the media player/media browser started, rather than staying on the channel in the zap timer.

This has a similar cause to Bug #480.

Replication steps

Create a zap timer for a few minutes in the future for a channel other than the one currently showing in live TV.

Return to live TV, then MEDIA, to enter the media browser.

Wait in the media browser until the timer starts.

When the timer starts, background service showing in the media browser changes to the channel in the zap timer. When the media browser is exited, the channel shown in live TV is changed to the one that was on live TV before the media browser started, rather than remaining on the channel in the zap timer.