Channelselection: Force zap when bouquet is changed and service is the same

This will upgrade e.g. the channel number to the current selected service