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

Change-Id: I35e8e83f565bea86f409da9dd7ca7314747d6ed9