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

Change-Id: I93958d0b8cf2d7a79af4ff534209848f3b0e35c2