Merge "msm_fb: display: remove #if 0" into msm-3.0