Merge "Fix an issue with VSYNC"