Merge "SearchView improvements per design."