am de33bf03: Merge "Allow search/voice toolbar icons to live in same activity" into jb-dev

* commit 'de33bf03a2fc14431807626c33e0c698370749e9':
  Allow search/voice toolbar icons to live in same activity