Merge pull request #8095 from leoetlino/audio-race Fix a race condition when shutting down audio stream