am 63d80895: am 697b9f58: am b8c2c78c: am c467ac37: am 06ff2f72: Merge "Fixes the issue with preview when ratio is 1:1" into jb-dev

* commit '63d808955225791d7fc7c0e3d52bc0b7abc0c013':
  Fixes the issue with preview when ratio is 1:1