Merge "Reduce excessive locking in UserManager"