Merge branch '3.1.0'

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2653.cs

@@ -148,7 +148,8 @@ namespace Xamarin.Forms.Controls.Issues
 			return true;
 		}
 
-#if UITEST
+// https://github.com/xamarin/Xamarin.Forms/issues/2989
+#if UITEST && !__ANDROID__
 		[Test]
 		public void ZIndexWhenInsertingChildren()
 		{

Xamarin.Forms.Platform.UAP/VisualElementTracker.cs

@@ -538,7 +538,7 @@ namespace Xamarin.Forms.Platform.UWP
 				// (i.e. their absolute value is 0), a CompositeTransform is instead used to allow for
 				// rotation of the control on a 2D plane, and the other values are set. Otherwise, the
 				// rotation values are set, but the aforementioned functionality will be lost.
-				if (Math.Abs(view.RotationX) == 0 && Math.Abs(view.RotationY) == 0)
+				if (Math.Abs(view.RotationX) != 0 || Math.Abs(view.RotationY) != 0)
 				{
 					frameworkElement.Projection = new PlaneProjection
 					{