Merge "Replace ACTION_USER_SWITCHED with UserTracker" into tm-qpr-dev