Merge "Fix initial audio glitch on startup" into lmp-dev