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

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