Merge "Listen to correct intents in UserTracker" into tm-dev