Update the order of the TextProps, as it seems not to be based quite on the mask order. Fix from Yegor, from bug #40143