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