diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
index a3b69c3584c..5ea7fa5b7fa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -333,6 +333,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
   @DoNotStrip
   @SuppressWarnings("unused")
   private long measure(
+      int rootTag,
       String componentName,
       ReadableMap localData,
       ReadableMap props,
@@ -341,7 +342,29 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
       float maxWidth,
       float minHeight,
       float maxHeight) {
+    return mMountingManager.measure(
+        mReactContextForRootTag.get(rootTag),
+        componentName,
+        localData,
+        props,
+        state,
+        getYogaSize(minWidth, maxWidth),
+        getYogaMeasureMode(minWidth, maxWidth),
+        getYogaSize(minHeight, maxHeight),
+        getYogaMeasureMode(minHeight, maxHeight));
+  }
 
+  @DoNotStrip
+  @SuppressWarnings("unused")
+  private long measure(
+      String componentName,
+      ReadableMap localData,
+      ReadableMap props,
+      ReadableMap state,
+      float minWidth,
+      float maxWidth,
+      float minHeight,
+      float maxHeight) {
     return mMountingManager.measure(
         mReactApplicationContext,
         componentName,
diff --git a/ReactCommon/fabric/components/slider/SliderShadowNode.cpp b/ReactCommon/fabric/components/slider/SliderShadowNode.cpp
index 6557295c2dc..39dd570865c 100644
--- a/ReactCommon/fabric/components/slider/SliderShadowNode.cpp
+++ b/ReactCommon/fabric/components/slider/SliderShadowNode.cpp
@@ -93,7 +93,7 @@ ImageSource SliderShadowNode::getThumbImageSource() const {
 
 Size SliderShadowNode::measure(LayoutConstraints layoutConstraints) const {
   if (SliderMeasurementsManager::shouldMeasureSlider()) {
-    return measurementsManager_->measure(layoutConstraints);
+    return measurementsManager_->measure(getSurfaceId(), layoutConstraints);
   }
 
   return {};
diff --git a/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.cpp b/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.cpp
index c44288caefc..da8a5280219 100644
--- a/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.cpp
+++ b/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.cpp
@@ -17,6 +17,7 @@ namespace facebook {
 namespace react {
 
 Size SliderMeasurementsManager::measure(
+    SurfaceId surfaceId,
     LayoutConstraints layoutConstraints) const {
   {
     std::lock_guard<std::mutex> lock(mutex_);
@@ -31,6 +32,7 @@ Size SliderMeasurementsManager::measure(
   static auto measure =
       jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
           ->getMethod<jlong(
+              jint,
               jstring,
               ReadableMap::javaobject,
               ReadableMap::javaobject,
@@ -47,6 +49,7 @@ Size SliderMeasurementsManager::measure(
 
   auto measurement = yogaMeassureToSize(measure(
       fabricUIManager,
+      surfaceId,
       componentName.get(),
       nullptr,
       nullptr,
diff --git a/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.h b/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.h
index 4b35d9e7d84..e049ce38c79 100644
--- a/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.h
+++ b/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.h
@@ -27,7 +27,7 @@ class SliderMeasurementsManager {
     return true;
   }
 
-  Size measure(LayoutConstraints layoutConstraints) const;
+  Size measure(SurfaceId surfaceId, LayoutConstraints layoutConstraints) const;
 
  private:
   const ContextContainer::Shared contextContainer_;
diff --git a/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.cpp b/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.cpp
index 8d7fc170631..9716b20c07d 100644
--- a/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.cpp
+++ b/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.cpp
@@ -11,6 +11,7 @@ namespace facebook {
 namespace react {
 
 Size SliderMeasurementsManager::measure(
+    SurfaceId surfaceId,
     LayoutConstraints layoutConstraints) const {
   assert(false); // should never reach this point
   return {};
diff --git a/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.h b/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.h
index 6f51fd1e7e8..9e7d02eaf80 100644
--- a/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.h
+++ b/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.h
@@ -26,7 +26,7 @@ class SliderMeasurementsManager {
     return false;
   }
 
-  Size measure(LayoutConstraints layoutConstraints) const;
+  Size measure(SurfaceId surfaceId, LayoutConstraints layoutConstraints) const;
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchMeasurementsManager.cpp b/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchMeasurementsManager.cpp
index 78df033f476..2cf6445eccc 100644
--- a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchMeasurementsManager.cpp
+++ b/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchMeasurementsManager.cpp
@@ -17,6 +17,7 @@ namespace facebook {
 namespace react {
 
 Size AndroidSwitchMeasurementsManager::measure(
+    SurfaceId surfaceId,
     LayoutConstraints layoutConstraints) const {
   {
     std::lock_guard<std::mutex> lock(mutex_);
@@ -31,6 +32,7 @@ Size AndroidSwitchMeasurementsManager::measure(
   static auto measure =
       jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
           ->getMethod<jlong(
+              jint,
               jstring,
               ReadableMap::javaobject,
               ReadableMap::javaobject,
@@ -47,6 +49,7 @@ Size AndroidSwitchMeasurementsManager::measure(
 
   auto measurement = yogaMeassureToSize(measure(
       fabricUIManager,
+      surfaceId,
       componentName.get(),
       nullptr,
       nullptr,
diff --git a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchMeasurementsManager.h b/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchMeasurementsManager.h
index b0cc5942df8..73b559fb5d3 100644
--- a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchMeasurementsManager.h
+++ b/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchMeasurementsManager.h
@@ -20,7 +20,7 @@ class AndroidSwitchMeasurementsManager {
       const ContextContainer::Shared &contextContainer)
       : contextContainer_(contextContainer) {}
 
-  Size measure(LayoutConstraints layoutConstraints) const;
+  Size measure(SurfaceId surfaceId, LayoutConstraints layoutConstraints) const;
 
  private:
   const ContextContainer::Shared contextContainer_;
diff --git a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchShadowNode.cpp b/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchShadowNode.cpp
index fe0dc73856f..d65adbd648f 100644
--- a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchShadowNode.cpp
+++ b/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchShadowNode.cpp
@@ -23,7 +23,7 @@ void AndroidSwitchShadowNode::setAndroidSwitchMeasurementsManager(
 
 Size AndroidSwitchShadowNode::measure(
     LayoutConstraints layoutConstraints) const {
-  return measurementsManager_->measure(layoutConstraints);
+  return measurementsManager_->measure(getSurfaceId(), layoutConstraints);
 }
 
 } // namespace react
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.mm b/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.mm
index 55be64985f0..e5f36454a1f 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.mm
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.mm
@@ -17,21 +17,23 @@ TextLayoutManager::TextLayoutManager(ContextContainer::Shared const &contextCont
   self_ = (__bridge_retained void *)[RCTTextLayoutManager new];
 }
 
-TextLayoutManager::~TextLayoutManager() {
+TextLayoutManager::~TextLayoutManager()
+{
   CFRelease(self_);
   self_ = nullptr;
 }
 
-void *TextLayoutManager::getNativeTextLayoutManager() const {
+void *TextLayoutManager::getNativeTextLayoutManager() const
+{
   return self_;
 }
 
 Size TextLayoutManager::measure(
     AttributedString attributedString,
     ParagraphAttributes paragraphAttributes,
-    LayoutConstraints layoutConstraints) const {
-  RCTTextLayoutManager *textLayoutManager =
-      (__bridge RCTTextLayoutManager *)self_;
+    LayoutConstraints layoutConstraints) const
+{
+  RCTTextLayoutManager *textLayoutManager = (__bridge RCTTextLayoutManager *)self_;
   return [textLayoutManager measureWithAttributedString:attributedString
                                     paragraphAttributes:paragraphAttributes
                                       layoutConstraints:layoutConstraints];