Merge "Dashboard search bar polish" into oc-dr1-dev