Merge "Fix a threading issue in AudioPlaybackHandler"