Merge "Fix getAdjustedCrop computation" into main