Merge "[Catalyst] Provide context for PreferenceLifecycleProvider.onActivityResult" into main