Merge "Use channel count for CHANNEL_MASK_USE_CHANNEL_ORDER"