Merge "Fix UpdatableFontDirTest" into main