Merge "Don't reassign `desiredAspectRatio` parameter in`applyAspectRatio`" into main