Merge change 23043 into donut

* changes:
  Revert "Remove third party support for Quick Search Box (aka global search)."