Merge "Use new minikin::Font constructor"