Merge "Show localized channel names"