Merge "Search bar polish" into oc-dr1-dev