[Windows] Clamp images inside buttons to button width/height

src/Controls/src/Core/Platform/Windows/Extensions/ButtonExtensions.cs

@@ -32,6 +32,8 @@ public static void UpdateContentLayout(this UI.Xaml.Controls.Button mauiButton,
 					content.LayoutImageLeft(spacing);
 					break;
 			}
+
+			content.InvalidateMeasure();
 		}
 
 		public static void UpdateLineBreakMode(this Microsoft.UI.Xaml.Controls.Button platformButton, Button button)

src/Controls/tests/DeviceTests/Elements/Layout/LayoutTests.cs

@@ -326,7 +326,47 @@ await AttachAndRun(grid, (handler) =>
 			});
 		}
 
-		/* Commented out of for now due to inconsistent platform behavior
+        [Fact]
+        [Category(TestCategory.Button, TestCategory.FlexLayout)]
+        public async Task ButtonWithImageInFlexLayoutInGridDoesNotCycle()
+        {
+            EnsureHandlerCreated((builder) =>
+            {
+                builder.ConfigureMauiHandlers(handler =>
+                {
+                    handler.AddHandler(typeof(Button), typeof(ButtonHandler));
+                    handler.AddHandler(typeof(Layout), typeof(LayoutHandler));
+                });
+            });
+
+            await ButtonWithImageInFlexLayoutInGridDoesNotCycleCore();
+            // Cycle does not occur on first run
+            await ButtonWithImageInFlexLayoutInGridDoesNotCycleCore();
+        }
+
+        async Task ButtonWithImageInFlexLayoutInGridDoesNotCycleCore()
+        {
+            var grid = new Grid() { MaximumWidthRequest = 150 };
+            grid.AddRowDefinition(new RowDefinition(GridLength.Auto));
+
+            var flexLayout = new FlexLayout() { Wrap = Layouts.FlexWrap.Wrap };
+            grid.Add(flexLayout);
+
+            for (int i = 0; i < 2; i++)
+            {
+                var button = new Button { ImageSource = "black.png" };
+                flexLayout.Add(button);
+            }
+
+            await InvokeOnMainThreadAsync(async () =>
+            {
+                // If this can be attached to the hierarchy and make it through a layout
+                // without crashing, then we're good.
+                await AttachAndRun(grid, (handler) => { });
+            });
+        }
+
+        /* Commented out of for now due to inconsistent platform behavior
 		[Fact("Ensures grid rows renders the correct size - Issue 15330")]
 		public async Task Issue15330()
 		{
@@ -401,7 +441,7 @@ public async Task Issue15330()
 			Assert.Equal(bitmap.Height / 3 * 2, cyanBlob.MinRow, 2d);
 		}*/
 
-		[Fact]
+        [Fact]
 		public async Task DependentLayoutBindingsResolve()
 		{
 			EnsureHandlerCreated((builder) =>

src/Core/src/Platform/Windows/ButtonExtensions.cs

@@ -160,9 +160,6 @@ public static void UpdateImageSource(this Button platformButton, WImageSource? n
 		{
 			if (platformButton.GetContent<WImage>() is WImage nativeImage)
 			{
-				// Stretch to fill
-				nativeImage.Stretch = UI.Xaml.Media.Stretch.Uniform;
-
 				// If we're a CanvasImageSource (font image source), we need to explicitly set the image height
 				// to the desired size of the font, otherwise it will be stretched to the available space
 				if (nativeImageSource is CanvasImageSource canvas)