Merge "Add textColorOnAccent" into sc-dev