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

Change-Id: I30549f0235dafa3dcb97f6207b0eda1a3ec8fbd3