Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev