Merge "[Catalyst] Provide lifecycleScope for PreferenceLifecycleContext" into main