Merge "misc drm@1.2 vts fixes"