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

Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff