DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207
am: 21ef672cab

Change-Id: Ia073a40c330038e77ff5992c056a8fe0a5924edb