Merge branch '4.1.0'

Xamarin.Forms.Platform.Android/ButtonLayoutManager.cs

@@ -82,8 +82,21 @@ namespace Xamarin.Forms.Platform.Android
 
 		internal SizeRequest GetDesiredSize(int widthConstraint, int heightConstraint)
 		{
+			var previousHeight = View.MeasuredHeight;
+			var previousWidth = View.MeasuredWidth;
+
 			View.Measure(widthConstraint, heightConstraint);
+
+			// if the measure of the view has changed then trigger a request for layout
+			// if the measure hasn't changed then force a layout of the button
+			if (previousHeight != View.MeasuredHeight || previousWidth != View.MeasuredWidth)
+			{
+				if (!View.IsLayoutRequested)
+					View.RequestLayout();
+			}
+			else
 				View.ForceLayout();
+
 			return new SizeRequest(new Size(View.MeasuredWidth, View.MeasuredHeight), Size.Zero);
 		}