Merge "Remove data race from refocus test" into nyc-dev