Merge "Use widget picker color surface for WidgetsBottomSheet" into sc-dev