Merge "msm_fb: display: suspend-resume on HDMI" into msm-3.4