Merge "Revert "Initialize UserTracker with boot user"" into main