Merge "msm_fb: display: fix division-by-zero bug" into msm-3.4