Remove CropImageTask imports
Merge branch 'fix-upload-fragment'