Merge "Stop sleeping in waitUntilAllThreadsStopped spin instead."