Merge "Fix thread pool test valgrind flakiness"