Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1