Merge "Include widget providers enabled at runtime" into sc-dev