Clean up when recycling a pid with a pending launch
am: d86e14e45c

Change-Id: If77af8cc8a0b9620c2fc5e4704c178667fc0703e