Merge change 4908 into donut

* changes:
  Remove checks for Activity Context when creating SearchManager