Merge "Do not reorder recommended widgets in widget picker." into sc-v2-dev