am 73fafb38: am f6834478: Always render text underline extra. Bug #3381287

* commit '73fafb382b9e44cac2e6a6649cd37a7dcb0c6de9':
  Always render text underline extra. Bug #3381287