Merge "MediaPlayer: fix channel mask handling" into tm-dev