Merge "Respect orientation of attachment previews." into jb-ub-mail-ur10