Merge "Use post-execution state for ActivityResultItem" into sc-v2-dev