Merge "Fix AddWidgetTest & AddWidgetConfigTest" into sc-dev