Merge "Decouple font collection logic from fallback building logic"