Merge "Re-enable AddConfigWidgetTest" into tm-qpr-dev