Fix bug 3385881

Launch signals and threads are not always
matched in index.  Threads grab launch indexes
as they start which may not be the order in which
they were launched.

Change-Id: I1ff42c3df5d7ebb46de6329ebd11ef67a5fc58ca