am dab15d14: Merge "Don\'t expand the SearchView if already expanded." into ics-mr1

* commit 'dab15d14ca2ce9c3a614e97869824c6337e76d51':
  Don't expand the SearchView if already expanded.