Merge "Group weather widgets under the widget category" into sc-v2-dev