Merge " msm_fb: display: retrieve correct base layer pipe" into msm-3.4