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

Change-Id: Ibdd69f2fa346dc31224fa6357718f56aa26ded1d