Merge "AudioSystem: Reduce service timeout from 10s to 5s" into main