diff --git a/analysis_options.yaml b/analysis_options.yaml
index 0f3f70d3cc..24dd08e926 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -122,7 +122,8 @@ linter:
     - prefer_asserts_in_initializer_lists
     - prefer_collection_literals
     - prefer_conditional_assignment
-    - prefer_const_constructors
+    # TODO(dnfield) - re-enable this when custom embedders catch up with the Rect/RRect constness.
+    # - prefer_const_constructors
     - prefer_const_constructors_in_immutables
     - prefer_const_declarations
     - prefer_const_literals_to_create_immutables
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index fbfc4d9257..fb4cce305e 100644
--- a/bin/internal/engine.version
+++ b/bin/internal/engine.version
@@ -1 +1 @@
-c63d1cf9c9ba8c7d8546f24c1248433bdf827153
+3e47b4bb39bb4993f03a278ea7b1c11ee6459b06
diff --git a/bin/internal/goldens.version b/bin/internal/goldens.version
index f70e9473c6..e167261972 100644
--- a/bin/internal/goldens.version
+++ b/bin/internal/goldens.version
@@ -1 +1 @@
-78dfbee0485dbe335edb37899839ac32d219edc1
+09ebc5361187e9cc20ddc350dc047f95812c61a4
diff --git a/packages/flutter/test/widgets/semantics_traversal_test.dart b/packages/flutter/test/widgets/semantics_traversal_test.dart
index 56464fdc1b..1c182a04a3 100644
--- a/packages/flutter/test/widgets/semantics_traversal_test.dart
+++ b/packages/flutter/test/widgets/semantics_traversal_test.dart
@@ -251,8 +251,11 @@ void main() {
 
     for (int i = 0; i < 8; i += 1) {
       final double angle = start + i.toDouble() * math.pi / 4.0;
-      final double dx = math.cos(angle) * 5.0;
-      final double dy = math.sin(angle) * 5.0;
+      // These values should be truncated so that double precision rounding
+      // issues won't impact the heights/widths and throw off the traversal
+      // ordering.
+      final double dx = (math.cos(angle) * 15.0) / 10.0;
+      final double dy = (math.sin(angle) * 15.0) / 10.0;
 
       final Map<String, Rect> children = <String, Rect>{
         'A': const Offset(10.0, 10.0) & tenByTen,
diff --git a/packages/flutter/test/widgets/widget_inspector_test.dart b/packages/flutter/test/widgets/widget_inspector_test.dart
index 80232aedaf..e1a3b0064b 100644
--- a/packages/flutter/test/widgets/widget_inspector_test.dart
+++ b/packages/flutter/test/widgets/widget_inspector_test.dart
@@ -2066,7 +2066,7 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           height: 300.0,
           debugPaint: true,
         ),
-        matchesGoldenFile('inspector.sizedBox_debugPaint.png'),
+        matchesGoldenFile('inspector.sizedBox_debugPaint.1.png'),
         skip: !Platform.isLinux,
       );
 
diff --git a/packages/flutter_test/lib/src/accessibility.dart b/packages/flutter_test/lib/src/accessibility.dart
index 5fac46a184..41ce39b254 100644
--- a/packages/flutter_test/lib/src/accessibility.dart
+++ b/packages/flutter_test/lib/src/accessibility.dart
@@ -113,10 +113,11 @@ class MinimumTapTargetGuideline extends AccessibilityGuideline {
         return result;
       // shrink by device pixel ratio.
       final Size candidateSize = paintBounds.size / tester.binding.window.devicePixelRatio;
-      if (candidateSize.width < size.width || candidateSize.height < size.height)
+      if (candidateSize.width < size.width - delta || candidateSize.height < size.height - delta) {
         result += Evaluation.fail(
           '$node: expected tap target size of at least $size, but found $candidateSize\n'
           'See also: $link');
+      }
       return result;
     }
     return traverse(root);
diff --git a/packages/flutter_test/test/matchers_test.dart b/packages/flutter_test/test/matchers_test.dart
index 2c4a3f5312..20c464890b 100644
--- a/packages/flutter_test/test/matchers_test.dart
+++ b/packages/flutter_test/test/matchers_test.dart
@@ -188,7 +188,7 @@ void main() {
   test('rectMoreOrLessEquals', () {
     expect(
       Rect.fromLTRB(0.0, 0.0, 10.0, 10.0),
-      rectMoreOrLessEquals(Rect.fromLTRB(1e-11, 0.0, 10.0, 10.0000000001)),
+      rectMoreOrLessEquals(Rect.fromLTRB(0.0, 0.0, 10.0, 10.00000000001)),
     );
 
     expect(