Merge "Don't let UnderlineSpans affect text width"