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

Change-Id: Id1ee0a3dd76a7bb549838e9d74b9927956b96570