Merge "Improve the VSYNC api a bit."