Merge "hal: Fix glitch in audio playback during device switch"