Merge branch '4.1.0' into 4.2.0

diff --cc Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index e250e29,f6655e1..06ffbe5
--- 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
@@@ -991,9 -977,8 +991,10 @@@
      <Compile Include="$(MSBuildThisFileDirectory)Issue6368.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue6077.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue3548.cs" />
+     <Compile Include="$(MSBuildThisFileDirectory)Issue6472.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue6614.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue5239.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue6738.cs" />
    </ItemGroup>
    <ItemGroup>
      <EmbeddedResource Include="$(MSBuildThisFileDirectory)Bugzilla22229.xaml">

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

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

diff --cc Xamarin.Forms.Platform.Android/ViewExtensions.cs
index 2645a88,1134377..52029a1
--- 1/Xamarin.Forms.Platform.Android/ViewExtensions.cs
--- 2/Xamarin.Forms.Platform.Android/ViewExtensions.cs
+++ b/Xamarin.Forms.Platform.Android/ViewExtensions.cs
@@@ -94,13 -94,14 +94,23 @@@ namespace Xamarin.Forms.Platform.Androi
                        view.ClipToOutline = value;
                }
  
 +              public static bool SetElevation(this AView view, float value)
 +              {
 +                      if (view.IsDisposed() || !Forms.IsLollipopOrNewer)
 +                              return false;
 +
 +                      view.Elevation = value;
 +                      return true;
 +              }
++              
+               internal static void MaybeRequestLayout(this AView view)
+               {
+                       var isInLayout = false;
+                       if ((int)Build.VERSION.SdkInt >= 18)
+                               isInLayout = view.IsInLayout;
+ 
+                       if (!isInLayout && !view.IsLayoutRequested)
+                               view.RequestLayout();
+               }
        }
  }

diff --cc Xamarin.Forms.Platform.Android/VisualElementRenderer.cs
index 94b9eaa,bddbd6d..3c90674
--- 1/Xamarin.Forms.Platform.Android/VisualElementRenderer.cs
--- 2/Xamarin.Forms.Platform.Android/VisualElementRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/VisualElementRenderer.cs
@@@ -235,10 -241,8 +235,11 @@@ namespace Xamarin.Forms.Platform.Androi
                        if (AutoTrack && Tracker == null)
                                SetTracker(new VisualElementTracker(this));
  
-                       SendVisualElementInitialized(element, this);
 +                      if (oldElement != null)
 +                              Tracker?.UpdateLayout();
 +
+                       if (element != null)
+                               SendVisualElementInitialized(element, this);
  
                        EffectUtilities.RegisterEffectControlProvider(this, oldElement, element);
  

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