Merge "Fix crash with FontProvider"