Merge "msm_fb: display: Report correct fps to user space" into msm-3.0