Merge "Revert "Add search bar to SearchActivity."" into oc-dev