Merge "Fixed the appearance of a bold text when setting underline property." into...