Merge "display: renaming thulium to msm8996"