am d7e80b9d: Merge "fix NPE in getSearchBox" into honeycomb-mr1

* commit 'd7e80b9d5046603ac4a36ea74e204a2ad70a4dca':
  fix NPE in getSearchBox