Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into klp-dev