msm: display: Cherry-pick fix