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

* commit '4c9cd7188f305f8d29a203b246d91644970aa65d':
  tablet search icon bug fixes and simplification