Merge "Remove UserLifecycleListener deps from UserDataRepository" into main