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

* commit '7eb084dde85c68de34a3d6bb6c78b3ec56a1cd06':
  tablet search icon bug fixes and simplification