Merge "[Output Switcher] Add new fields in metrics event" into udc-qpr-dev