Merge "Retire BitmapCropTask to avoid using AsyncTask"