Merge "Consider channel index masks when calculating channel counts." into mnc-dev