Merge "msm_fb: display: Add timeout for waiting on update" into msm-3.4