Merge "SF: Disallow VSYNC injection outside tests" into sc-dev