Merge "Fix custom font rendering" into mnc-ub-dev
am: f5984d5fce

* commit 'f5984d5fce511a669e8d4bb6eaeb9679ff2ba9f0':
  Fix custom font rendering