Merge "MediaPlayer: Permit VolumeShaper operations on gapless playback" into oc-dr1-dev