am 28b4d3a8: Merge "Improve image size change handling." into jb-dev

* commit '28b4d3a8fd7a70647f9445752bf1a4e73b99f265':
  Improve image size change handling.