Merge "Add support for text underline and strikethru."