DO NOT MERGE: Clean up when recycling a pid with a pending launch
am: b02862c2cf

Change-Id: Id89010f4bf96a43ef9f97488353fbdf89c6f2931