Merge "Use more padding on the sides for SearchView" into honeycomb-mr1