Merge "SF: Fix VSYNC injection"