Merge branch '3.6.0' into 4.0.0

Xamarin.Forms.Core/HandlerAttribute.cs

@@ -26,4 +26,4 @@ namespace Xamarin.Forms
 			return true;
 		}
 	}
-}
+}

Xamarin.Forms.Core/VisualElement.cs

@@ -8,7 +8,6 @@ namespace Xamarin.Forms
 {
 	public partial class VisualElement : NavigableElement, IAnimatable, IVisualElementController, IResourcesProvider, IStyleElement, IFlowDirectionController, IPropertyPropagationController, IVisualController
 	{
-
 		public new static readonly BindableProperty NavigationProperty = NavigableElement.NavigationProperty;
 
 		public new static readonly BindableProperty StyleProperty = NavigableElement.StyleProperty;

Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj

@@ -397,4 +397,4 @@
     <MSBuild Targets="Restore" Projects="Xamarin.Forms.Platform.Android.csproj" Properties="CreateAllAndroidTargets=false;Configuration=$(Configuration);Platform=$(Platform);">
     </MSBuild>
   </Target>
-</Project>
+</Project>

Xamarin.Forms.Platform.iOS/Extensions/LabelExtensions.cs

@@ -108,7 +108,9 @@ namespace Xamarin.Forms.Platform.MacOS
 #if __MOBILE__
 			layoutManager.CharacterRangeForGlyphRange(characterRange, ref glyphRange);
 #else
+#pragma warning disable CS0618 // Type or member is obsolete
 			layoutManager.CharacterRangeForGlyphRange(characterRange, out glyphRange);
+#pragma warning restore CS0618 // Type or member is obsolete
 #endif
 			return layoutManager.BoundingRectForGlyphRange(glyphRange, textContainer);
 		}