Merge change I89e74ba1 into eclair

* changes:
  Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.