Moved call for last location to onActivityResult to get updated location when image from camera is returned