Merge "Add OVERRIDE_MIN_ASPECT_RATIO_SMALL" into main