Merge "AudioSystem: fix "keep in sync" comments"