Merge "NuPlayer: Update code for channel mask conversion refactor"