Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2