Merge "Clamp start delay to non-negative range" into nyc-dev