Merge "ASoC: msm-hdmi-codec-rx: sync state with HDMI core"