Merge "Use channel mask instead of channel count for track creation"