Merge "audio: mute/unmute HDMI audio earlier" into jb-mr1-dev