Fixed call to Properties field when field optimization is disabled (#548)

Author: aborziak-ms

source/UIDataCodeGen/CodeGen/InstantiatorGeneratorBase.cs

@@ -1296,14 +1296,6 @@ string CallFactoryFromFor_UnCached(ObjectData callerNode, ObjectData calleeNode)
                     return calleeNode.FieldName!;
                 }
 
-                if (_owner._disableFieldOptimization)
-                {
-                    // When field optimization is disabled, always return a call to the factory.
-                    // If the factory has been called already, it will return the value from
-                    // its storage.
-                    return calleeNode.FactoryCall();
-                }
-
                 if (calleeNode.Object is CompositionPropertySet propertySet)
                 {
                     // CompositionPropertySets do not have factories unless they are
@@ -1315,6 +1307,14 @@ string CallFactoryFromFor_UnCached(ObjectData callerNode, ObjectData calleeNode)
                     }
                 }
 
+                if (_owner._disableFieldOptimization)
+                {
+                    // When field optimization is disabled, always return a call to the factory.
+                    // If the factory has been called already, it will return the value from
+                    // its storage.
+                    return calleeNode.FactoryCall();
+                }
+
                 // Find the vertex from caller to callee.
                 var firstVertexFromCallerToCallee =
                         (from inref in calleeNode.InReferences