Merge "Adding TvExtender channel override"