Merge "vsync.cpp test is throwing error whe compiled"