Merge "Use correct task bounds after updating override config" into nyc-dev