Merge "Fix BlockUntilVSync() to actually block"