Scope Native Animated null override clearing

Author: jingjing2222

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.kt

@@ -627,7 +627,7 @@ internal constructor(
     if (ReactNativeFeatureFlags.overrideBySynchronousMountPropsAtMountingAndroid()) {
       val propsMap = getMapFromPropsReadableMap(props)
       val synchronousMountProps = tagToSynchronousMountProps[reactTag] ?: mutableMapOf()
-      removeNullPropsFromPropsReadableMap(props, synchronousMountProps)
+      removeNullTransformAndOpacityPropsFromPropsReadableMap(props, synchronousMountProps)
       synchronousMountProps.putAll(propsMap)
       if (synchronousMountProps.isEmpty()) {
         tagToSynchronousMountProps.remove(reactTag)
@@ -1394,16 +1394,19 @@ internal constructor(
       return outputMap
     }
 
-    private fun removeNullPropsFromPropsReadableMap(
+    private fun removeNullTransformAndOpacityPropsFromPropsReadableMap(
         readableMap: ReadableMap,
         outputMap: MutableMap<String, Any>,
     ) {
-      val iterator = readableMap.keySetIterator()
-      while (iterator.hasNextKey()) {
-        val propKey = iterator.nextKey()
-        if (readableMap.getType(propKey) == ReadableType.Null) {
-          outputMap.remove(propKey)
-        }
+      // Native Animated uses synchronous null updates to restore animated-managed props.
+      // Keep this scoped to props stored by this override path today.
+      if (readableMap.hasKey(PROP_TRANSFORM) &&
+          readableMap.getType(PROP_TRANSFORM) == ReadableType.Null) {
+        outputMap.remove(PROP_TRANSFORM)
+      }
+      if (readableMap.hasKey(PROP_OPACITY) &&
+          readableMap.getType(PROP_OPACITY) == ReadableType.Null) {
+        outputMap.remove(PROP_OPACITY)
       }
     }