Merge "SF: Avoid adjusting the frame time when last frame is presented early" into main