Patch by Louie Lu.
(cherry picked from commit f776eb0f)
(includes diffs of  ed014f7e and 9f9192af)
* fix config reset from pr 2754

* Fix test_get_font (from pr 2769)