Merge changes I21b77905,Ia98ec539

* changes:
  VolumeShaper: Use VolumeAutomation interface and unhide
  VolumeShaper: Remove PlayerProxy constructor