Merge "drm vts 1.2 refactor"