Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev