Merge "Update accent colors" into sc-dev