Merge change 22897 into eclair

* changes:
  Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.