Merge "msm_fb: display: move the prefill function inside the config flag" into msm-3.0