Merge "Migrate to new UserTracker for currentUser"