Merge "Don't require post-execution state for onActivityResult" into pi-dev