Merge "Replace getCurrentUser() calls with UserTracker"