Merge "Leave the default image size alone; add gray background" into jb-ub-mail