Fix |cleanup| regression in the viewer
Merge pull request #5374 from Snuffleupagus/viewer-cleanup-regression

Fix |cleanup| regression in the viewer
Adds optional argument to FontFace contructor call.
Merge pull request #5376 from yurydelendik/fontface3

Adds optional argument to FontFace contructor call.
Fix how matches are found in search

Instead of keeping track of where the search starts, just
keep track of the number of pages and make sure we don't
visit pages more than once.