Merge "Prevent deadlock when calling BT or Audio" into main