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

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