Merge "Replace user switching events with UserTracker" into tm-qpr-dev