Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev