Merge "Make CropView handle images that aren't full-height" into sc-dev