Merge "SF: keep a reference vsync point before clearing timestamps" into main