Merge "SF: ignore very close vsync timestamps" into sc-dev