Merge "Don't change anything if multi_crop is false." into 24D1-dev