Merge "NuPlayer: Update code for channel mask conversion refactor" into tm-qpr-dev