Merge "SF: fix expected vsync time when changing work duration" into sc-dev