am 6357c18b: Merge "Modify image attachments previews to conform to UX specs" into jb-ub-mail-ur8

* commit '6357c18b046b680d8f75a795fb43f6678405758a':
  Modify image attachments previews to conform to UX specs