Merge "drm/msm/dsi-staging: rename ctrl index to cell_index" into msm-4.9