Merge "Overview - update UI to use solid color scrim." into sc-dev