Merge "msm_fb: Handle multiple histogram reader errors during suspend/resume" into msm-3.4