Merge "Revert "Apply overlay updates to widget provider info"" into sc-dev