Merge "[18/n] Extract applyAspectRatio logic" into main