Merge "Revert "Temporarily disabling custom search controller"" into ub-launcher3-calgary
am: f63c46bf5e

* commit 'f63c46bf5e304c36fc15fa4f15af9cb98fde762d':
  Revert "Temporarily disabling custom search controller"