Merge "Adjust the line height to the locale based font metrics" into main