Canonicalization: combine text-* and leading-* classes
#19396
+208
−64
Merged