am 6c4ee263: Merge "Super collapse polish." into ub-gmail-ur14-dev

* commit '6c4ee263aab0a5ab84c299854bd7c63ceca407ec':
  Super collapse polish.