Merge "Fix the text size."