Merge "Add new atoms to track user journeys, such as user switches." into rvc-dev