Merge "Rename $search to $engine to match hook docs for SpecialSearchSetupEngine"