Merge "Adjust colors for accessibility" into sc-dev