am 514fb121: Merge "Make sure we resize even single images" into jb-ub-mail-ur8

* commit '514fb121c5889516d396f7f9b425499788a8f644':
  Make sure we resize even single images