Merge "Only setting height to 1 when we are reducing the width" into studio-1.4-dev
automerge: 3bc9319

* commit '3bc93194f64d3b2182824384e524a43aaf984ab8':
  Only setting height to 1 when we are reducing the width