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