Correctly revert to current tv or radio bouquet

When e.g. we are in TV mode and the service is not available in any
bouquet then the TV mode bouquet was reverted and the radio bouquets were
focused to the latest radio bouquet. Now we always revert to the correct
tv or radio bouquet.
merge remote from openpli