am c36bfb3e: am 0363c43b: am 4c9cd718: Merge "tablet search icon bug fixes and simplification" into ub-gmail-ur14-dev

* commit 'c36bfb3e18e25f564d91067c47e54c6548e7cbfa':
  tablet search icon bug fixes and simplification