Merge "Make UserTrackerImpl.userInfo thread-safe." into main