Merge "Fix custom font rendering" into mnc-ub-dev