Merge "drm vts 1.1 refactor"