Merge "Remove scrim from navigation bar from full widget picker." into sc-dev