Merge "Avoid crashing when failing graphics VTS" into main