Merge "fix NPE in getSearchBox" into honeycomb-mr1