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

* commit '0363c43b4701b87ddd925c387b9f002257f91212':
  tablet search icon bug fixes and simplification