Merge "Fix deadlock in AudioService"