Merge "drm/msm/sde: standardize hw block caps naming"