Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev