Merge "fix an issue with vsync event delivery"