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

* commit '67d1199408fefb5e6a19a46d4d21b3ff9c480b80':
  Be less brutal about updating the conversation view