Merge "Add metrics for guest user" into sc-dev