Merge "Fix SearchView background too high" into nyc-dev