Merge "C2: channel mask can be input to encoder" into udc-dev