Merge "Fix failing drm 1.0 vts tests" into pi-dev