Merge "Deprecate SearchEngine::userHighlightPrefs()"