am 886d32ed: am 1b01ea1c: am 67d11994: am 23f0740f: Merge "Be less brutal about updating the conversation view" into ub-gmail-ur14-dev

* commit '886d32edb516676cec88f23000c3c10021c01ba1':
  Be less brutal about updating the conversation view