am aebbe265: Fix two font issue that are causing crashes and ANRs

* commit 'aebbe265b8f9136fa5a5f44141cd5a4bb0914d21':
  Fix two font issue that are causing crashes and ANRs