Merge "Reducing the number of recent tasks we keep." into nyc-dev