Merge change 23105 into eclair

* changes:
  Fix issue 2077333: The volume key will effect both ring and media vol at the same time.