Merge "Add CropView for long screenshots" into sc-dev