Merge "Reorganize system font APIs"