Merge "Make gray palette neutral" into sc-dev