Merge "SF: VSyncTracker, clear timestamps on beginResync"