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

This reverts commit 53bff9a19a0a3b803ebfe719553d3554e767a033.
FIX

Change-Id: I1c3c4db0c55282793f64547064e55c69775799e1