Merge "Restore text color state list" into sc-dev