Merge "SF: Use last commited vsync for the next vsync callback" into main