am 4bd6592a: am 18bc55d1: Merge remote-tracking branch \'goog/jb-ub-mail\' into gmailmerge
* commit '4bd6592a9709c6dab7ba46d1b548d83525e3485d':
Reduce time until first revision of a chip is drawn.
dont replace the text in the text field when editing a fake or generated entry
Make sure that we take the existng temporary contact, where available.
Make sure that the last "fake entry" chip is correctly committed
Update chips to follow new ux spec for replacement
Reset maxlines when the user expands text
Fix for panorama icon not always showing up in photo viewer.
Show old results
Restart loader on attachment cursor updates
Load preview first
Set the scale type for the default image icon
Make sure we check the most up to date text for the token offsets.
Add comments to the recipientedittextview replace code.
Fix crashes associated with new logic to replace entire address with name + address
