Merge "Moving crop to a separate activity.  Refactoring." into gb-ub-photos-bryce