Merge "Revert to Fix AddConfigWidgetTest" into udc-dev