Merge "Deprecate overriding SearchEngine::search*"