Merge branch '4.0.0'

diff --cc GitInfo.txt
index ee74734,fcdb2e1..99eba4d
--- 1/GitInfo.txt
--- 2/GitInfo.txt
+++ b/GitInfo.txt
@@@ -1,1 -1,1 +1,1 @@@
- 4.1.0
 -4.0.0
++4.1.0

diff --cc Xamarin.Forms.ControlGallery.MacOS/AppDelegate.cs
Simple merge

diff --cc Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index cf8117b,a4755f1..3ce5960
--- 1/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
--- 2/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@@ -9,8 -9,8 +9,9 @@@
      <Import_RootNamespace>Xamarin.Forms.Controls.Issues</Import_RootNamespace>
    </PropertyGroup>
    <ItemGroup>
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue5555.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Bugzilla59172.cs" />
+     <Compile Include="$(MSBuildThisFileDirectory)Issue5376.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Bugzilla60787.xaml.cs">
        <DependentUpon>Bugzilla60787.xaml</DependentUpon>
        <SubType>Code</SubType>

diff --cc Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs
Simple merge

diff --cc Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs
Simple merge

diff --cc Xamarin.Forms.Platform.Android/Platform.cs
Simple merge

diff --cc Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj
Simple merge

diff --cc Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs
Simple merge

diff --cc Xamarin.Forms.Xaml/XamlParser.cs
Simple merge