Merge "Fix for race condition when loading fonts from font provider"