Merge "Remove UserLifecycleListener deps from SecureSettingsWrapper" into main