Merge "AudioService: fix deadlock"