Merge "SF: add more traces when adding vsync timestamps" into main