Merge "graphics: fix failed VTS cases"