Merge "Fix possible races in vsync infrastructure."