Merge "Search Icon persists through screen rotation" into oc-dev