Merge "Unify user init logic in IMMS#onUnlockUser()" into main