Merge "Code Refactor: UserTrackerImpl.UserTracker.Callback calls." into main