Backport of "discoverer: Start discovering next URI from right thread" into 1.16
Backport of !567 (merged) "discoverer: Start discovering next URI from right thread".
Commits:
- 1e9da26b discoverer: Start discovering next URI from right thread
Backport of !567 (merged) "discoverer: Start discovering next URI from right thread".
Commits: