Merge "Fix CropView sizing on full-width images" into sc-dev