Merge "Fix userId propagation in IMMS.Lifecycle#onUserCreated()" into main