Merge "Update Search UX for OC" into oc-dev