Merge "AudioService: Resolve stream before sending to volume UI."