Merge "Fix accent color not being applied" into sc-dev