Merge "Fix an issue where a non-styled string could be made into a styled string"