Merge "Replace getCurrentUser() calls with UserTracker" into tm-qpr-dev