Merge "Added more events to user switch journey" into rvc-dev am: 6a468598f0

Change-Id: I4a9f84f08bdbd9fc6fc26fcea0713a0ef0b71313