Merge "msm_fb: display: Fix suspend/resume for HDMI as primary display" into msm-3.0