Merge change 23798 into eclair

* changes:
  Fix issue 2097083: STREAM_SYSTEM should be at max volume.