Merge "Fix fallback paths for dumping threads."