Rolled back commit - further onActivityResult changes