Merge to XFA: Fix missing include for std::min