Merge "AudioTrack: Refine the wait for volume ramp on pause"