Merge "Preserve text colors when applying font style"