Merge "Revert "Don't let UnderlineSpans affect text width""