Fixing the adjust font restore scroll and adding unit tests
Fixes after first review
Merge remote-tracking branch 'upstream/master' into tom/font-size-2
Changes to the restore scroll
Doc fixes
Merge pull request #3300 from TomMalbran/tom/font-size-2

Fixing the adjust font restore scroll and adding unit tests