Merge "SF: dont shift vsync timeline unless missed a frame" into main