Merge "Allow Workspace Scrim to be colored per state" into sc-dev