Merge "AudioService: fix cross deadlock" into qt-dev