Merge "AudioSystem: Add thread safety annotations" into main