Merge "SearchManager: Fix unit tests breakage." into main