Merge branch 'fix-early-audio-take2' into staging