Merge "[4.0] Fixed the appearance of a bold text when setting underline property...