Merge "msm_fb: display: add wait4dmae for hdmi as primary display"