Merge "Unhide new channel masks and deprecate old channel masks"