Merge "Improve progress feedback for long-running directory searches." into jb-dev