Merge "hal: Fix Glitch issue during concurrent playback"