Revert "Revert "Display Settings: Better font size control""

This reverts commit 0df672a16b7250e5fd263f6d52f1b9b5d035bcd6.
Fix build

(cherry picked from commit 6b8479c3de650c85aa49e12a7388ef580a4fe534)