Merge "msm_fb: display: Fix blend configuration for MDP4.1" into msm-3.4