Merge "Move channel listing into a pref controller"