Merge "Reducing the contrast of text underline" into jb-dev