Merge "fix a bug with vsync management"