Merge "Don't wedge full data backups by blocking the data consumer thread" into nyc-dev