Merge "Fix colors for a11y" into sc-dev