CB-7071 android: Fix callback firing before CROP intent is sent when allowEdit=true