Merge branch '4.4.0'

# Conflicts:
#	Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
#	Xamarin.Forms.Core/Button.cs
#	Xamarin.Forms.Core/IImageElement.cs
#	Xamarin.Forms.Platform.iOS/Renderers/ShellSectionRootHeader.cs

diff --cc Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
index b767283,46d5e47..d1819bd
--- 1/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
--- 2/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
@@@ -619,16 -619,21 +619,21 @@@ namespace Xamarin.Forms.Control
                                return;
                        }
  
-                       Items[0].Items[0].Items.Add(new ShellContent()
+                       var content = new ShellContent()
                        {
                                Title = title ?? page.Title,
 -                              Content = page
 +                              Content = page,
-                               Icon = icon
-                       });
++                              Icon = icon                     
+                       };
+ 
+                       Items[0].Items[0].Items.Add(content);
+ 
+                       if (!String.IsNullOrWhiteSpace(content.Title))
+                               content.Route = content.Title;
                }
  
 -              public ContentPage AddBottomTab(string title)
 +              public ContentPage AddBottomTab(string title, string icon = null)
                {
 -
                        ContentPage page = new ContentPage();
                        Items[0].Items.Add(new ShellSection()
                        {

diff --cc Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index 4fff290,8a8ee3c..fcbe8e2
--- 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
@@@ -20,18 -21,11 +21,19 @@@
      <Compile Include="$(MSBuildThisFileDirectory)CollectionViewHeaderFooterTemplate.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)CollectionViewHeaderFooterView.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)CollectionViewItemsUpdatingScrollMode.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue4606.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue8177.cs" />
+     <Compile Include="$(MSBuildThisFileDirectory)Issue7773.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue8186.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue3475.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue6556.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue5830.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue6476.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue6693.xaml.cs">
 +      <DependentUpon>Issue6693.xaml</DependentUpon>
 +      <SubType>Code</SubType>
 +    </Compile>
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue7396.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue7825.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue2271.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue5354.xaml.cs">
@@@ -1164,9 -1158,9 +1173,10 @@@
        <DependentUpon>Issue7886.xaml</DependentUpon>
      </Compile>
      <Compile Include="$(MSBuildThisFileDirectory)Issue7898.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue8198.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue7249.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue8200.cs" />
+     <Compile Include="$(MSBuildThisFileDirectory)Issue8417.xaml.cs" />
    </ItemGroup>
    <ItemGroup>
      <EmbeddedResource Include="$(MSBuildThisFileDirectory)Bugzilla22229.xaml">
@@@ -1641,13 -1627,12 +1652,18 @@@
    <ItemGroup>
      <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue7048.xaml">
        <SubType>Designer</SubType>
-       <Generator>MSBuild:Compile</Generator>
+       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+     </EmbeddedResource>
+   </ItemGroup>
+   <ItemGroup>
+     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue8529_1.xaml">
+       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
      </EmbeddedResource>
    </ItemGroup>
 +  <ItemGroup>
 +    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue6693.xaml">
 +      <SubType>Designer</SubType>
 +      <Generator>MSBuild:Compile</Generator>
 +    </EmbeddedResource>
 +  </ItemGroup>
  </Project>

diff --cc Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
Simple merge

diff --cc Xamarin.Forms.Core/Button.cs
index 99d666a,440e6a2..74ef701
--- 1/Xamarin.Forms.Core/Button.cs
--- 2/Xamarin.Forms.Core/Button.cs
+++ b/Xamarin.Forms.Core/Button.cs
@@@ -339,8 -340,14 +340,14 @@@ namespace Xamarin.Form
                {
                }
  
 -              void IImageElement.OnImageSourcesSourceChanged(object sender, EventArgs e) =>
 -                      ImageElement.ImageSourcesSourceChanged(this, e);
+ 
+               bool IImageController.GetLoadAsAnimation() => false;
+               bool IImageElement.IsLoading => false;
+ 
+               bool IImageElement.IsAnimationPlaying => false;
+ 
 +              void IImageElement.OnImageSourceSourceChanged(object sender, EventArgs e) =>
 +                      ImageElement.ImageSourceSourceChanged(this, e);
  
                void IButtonElement.OnCommandCanExecuteChanged(object sender, EventArgs e) =>
                        ButtonElement.CommandCanExecuteChanged(this, EventArgs.Empty);

diff --cc Xamarin.Forms.Core/IImageElement.cs
index c5a4b1f,ce1e7e0..f602922
--- 1/Xamarin.Forms.Core/IImageElement.cs
--- 2/Xamarin.Forms.Core/IImageElement.cs
+++ b/Xamarin.Forms.Core/IImageElement.cs
@@@ -14,6 -16,8 +14,8 @@@ namespace Xamarin.Form
  
                //note to implementor: but implement these methods explicitly
                void RaiseImageSourcePropertyChanged();
 -              void OnImageSourcesSourceChanged(object sender, EventArgs e);
 +              void OnImageSourceSourceChanged(object sender, EventArgs e);
+               bool IsLoading { get; }
+               bool IsAnimationPlaying { get; }
        }
  }

diff --cc Xamarin.Forms.Core/Image.cs
Simple merge

diff --cc Xamarin.Forms.Core/ImageButton.cs
Simple merge

diff --cc Xamarin.Forms.Core/ImageElement.cs
Simple merge

diff --cc Xamarin.Forms.Core/Items/CarouselView.cs
Simple merge

diff --cc Xamarin.Forms.CustomAttributes/TestAttributes.cs
Simple merge

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

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

diff --cc Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs
index a790a8a,166d754..9caeecc
--- 1/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs
--- 2/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs
+++ b/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs
@@@ -139,15 -146,13 +146,20 @@@ namespace Xamarin.Forms.Platform.Androi
  
                        if (disposing)
                        {
+                               if (_appBar.IsAlive() && _appBar.ViewTreeObserver.IsAlive())
+                                       _appBar.ViewTreeObserver.RemoveOnGlobalLayoutListener(_globalLayoutListener);
+ 
+                               _globalLayoutListener.Invalidate();
+ 
                                if (_backButtonBehavior != null)
                                        _backButtonBehavior.PropertyChanged -= OnBackButtonBehaviorChanged;
 +
 +                              if(Page?.ToolbarItems?.Count > 0)
 +                              {
 +                                      foreach (var item in Page.ToolbarItems)
 +                                              item.PropertyChanged -= OnToolbarItemPropertyChanged;
 +                              }
 +
                                ((IShellController)_shellContext?.Shell)?.RemoveFlyoutBehaviorObserver(this);
  
                                UpdateTitleView(_shellContext.AndroidContext, _toolbar, null);

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

diff --cc Xamarin.Forms.Platform.UAP/Resources.xaml
index fd9a805,e94a0a3..e0fecff
--- 1/Xamarin.Forms.Platform.UAP/Resources.xaml
--- 2/Xamarin.Forms.Platform.UAP/Resources.xaml
+++ b/Xamarin.Forms.Platform.UAP/Resources.xaml
@@@ -34,10 -34,10 +34,11 @@@
        <uwp:KeyboardConverter x:Key="KeyboardConverter" />
        <uwp:MasterBackgroundConverter x:Key="MasterBackgroundConverter" />
        <uwp:ImageSourceIconElementConverter x:Key="ImageSourceIconElementConverter" />
+     <!-- We probably want to keep this in sync with AppBarThemeCompactHeight in MasterDetailControlStyle.xaml (in uwp:FormsCommandBar.Resources) -->
        <x:Double x:Key="TitleBarHeight">48</x:Double>
 +    <x:Double x:Key="ListViewHeaderItemMinHeight">0</x:Double>
  
 -      <DataTemplate x:Key="PushPinTemplate">
 +    <DataTemplate x:Key="PushPinTemplate">
          <Path Data="M 50.7361,983.661 C 44.1895,983.661 38.8369,988.97 38.8369,995.517 39.8649,1003.3 45.246,1008.1 49.8547,1014.12 50.2838,1014.66 51.2336,1014.66 51.6619,1014.12 52.1384,1013.48 52.7575,1012.73 53.4248,1011.91 55.0322,1012.07 56.4727,1012.32 57.5676,1012.71 58.407,1013 59.06,1013.33 59.4192,1013.63 59.7784,1013.93 59.7716,1014.11 59.7716,1014.16 59.7716,1014.21 59.7716,1014.39 59.4192,1014.69 59.06,1014.99 58.407,1015.32 57.5676,1015.61 55.8888,1016.2 53.4519,1016.63 50.7361,1016.63 48.0204,1016.63 45.5399,1016.2 43.8611,1015.61 43.0218,1015.32 42.3695,1014.99 42.0103,1014.69 41.6504,1014.39 41.6135,1014.21 41.6135,1014.16 41.6135,1014.11 41.6511,1013.93 42.0103,1013.63 42.3695,1013.33 43.0218,1013 43.8611,1012.71 44.3158,1012.55 44.8455,1012.35 45.4039,1012.22 L 43.8611,1010.33 C 43.6124,1010.4 43.3441,1010.46 43.1119,1010.55 42.1005,1010.9 41.2318,1011.31 40.5555,1011.87 39.8799,1012.43 39.3216,1013.22 39.3216,1014.16 39.3216,1015.1 39.8799,1015.85 40.5555,1016.41 41.2318,1016.97 42.1005,1017.42 43.1119,1017.77 45.1356,1018.48 47.8025,1018.92 50.7362,1018.92 54.437,1018.81 57.9892,1018.36 60.8733,1016.41 62.5084,1014.79 62.0756,1013.4 60.8733,1011.87 60.1969,1011.31 59.3726,1010.9 58.3612,1010.55 57.4331,1010.22 56.3503,1009.94 55.1878,1009.75 56.1992,1008.51 57.2362,1007.18 58.2289,1005.79 60.5599,1002.51 62.5918,998.968 62.5918,995.517 62.5918,988.97 57.2836,983.661 50.7362,983.661 Z M 50.7361,989.655 C 47.571,989.655 44.9627,992.219 44.9627,995.385 44.9627,998.55 47.571,1001.16 50.7361,1001.16 53.902,1001.16 56.4659,998.55 56.4659,995.385 56.4659,992.219 53.902,989.655 50.7361,989.655 Z M 50.7361,991.947 C 52.6591,991.947 54.174,993.462 54.174,995.385 54.174,997.307 52.6591,998.866 50.7361,998.866 48.8139,998.866 47.2546,997.307 47.2546,995.385 47.2546,993.462 48.8139,991.947 50.7361,991.947 Z" Fill="#000000"  Height="74" Stretch="Fill" Margin="0" Width="50"/>
      </DataTemplate>