DO NOT MERGE: Clean up when recycling a pid with a pending launch am: 55eacb9441 am: b7380a1c0c
am: 0bd456467f  -s ours

Change-Id: If7c7b4e6932a401eba750d7d626d01c54537f8f6