Merge "Move underline thickness and position computation to Paint"