Merge "SF: VSyncReactor change offsets at correct time"