Merge "Fix system audio mode failure in boot up" into lmp-dev