waitUntilNoActivityUpTo should also produce a thread dump (despite 80da8f2).
Merge REMERGE_HEAD into HEAD