Merge "Clean up channel count and channel mask"