Merge "Update appearance of channel preferences"