am 61f6d18c: 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 '61f6d18c5797b0aa959dff4550f8c10754fd2ad6':
  Fixes the issue with preview when ratio is 1:1