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

* commit '2c8ac8c9f26b96055d1438c634f4ca95f2e92663':
  tablet search icon bug fixes and simplification