Merge "Tracing for AddConfigWidgetTest" into udc-dev