Fix overlapping lines when text size is changed
Merge remote-tracking branch 'origin/jsd2' into jsd2