Merge "Move VolumeController into AudioService"