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

* commit '1b01ea1c466229620a859dd2deaa2ac798034902':
  Be less brutal about updating the conversation view