Merge "Revert "Use new minikin::Font constructor""