Merge "Allow codec2/g711 codec to handle 6 channels" into qt-qpr1-dev