Merge "New blue baseline colors" into sc-dev