Merge "Protect ScanStats from race conditions" into nyc-dev