Merge "SF: correct latent problem in VSyncDispatch"