Merge "Rename crop_legacy to just crop" into sc-dev