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

Change-Id: Ib48160416a27bb34744fa9897ab51593197ac27b