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

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