Merge "Update scrim in widget pickers." into sc-dev