Fix font flickering due to missed check in font cache.
Merge pull request #3362 from glennw/fix-layout-fonts

Fix font flickering due to missed check in font cache.