Merge "Do not wait for unlaunched threads in stop()"