Merge "Remove specified line height to avoid text overlap" into main