Conflicts: cocos/platform/android/jni/JniCocosActivity.cpp cocos/platform/apple/JsbBridgeWrapper.mm cocos/platform/ohos/jni/JniCocosAbility.cpp cocos/renderer/gfx-metal/MTLCommandBuffer.mm external/config.json