Merge branch '4.2.0' into 4.3.0

diff --cc Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index b245226,61ffec7..b613885
--- 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
@@@ -1055,7 -1023,7 +1055,8 @@@
      <Compile Include="$(MSBuildThisFileDirectory)Issue6894.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue6929.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Controls\ApiLabel.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue7525.xaml.cs" />
+     <Compile Include="$(MSBuildThisFileDirectory)Issue7582.cs" />
    </ItemGroup>
    <ItemGroup>
      <EmbeddedResource Include="$(MSBuildThisFileDirectory)Bugzilla22229.xaml">
@@@ -1397,16 -1346,4 +1398,16 @@@
        <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
      </EmbeddedResource>
    </ItemGroup>
 -</Project>
 +  <ItemGroup>
 +    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue7357.xaml">
 +      <SubType>Designer</SubType>
 +      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
 +    </EmbeddedResource>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue7519Xaml.xaml">
 +      <SubType>Designer</SubType>
 +      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
 +    </EmbeddedResource>
 +  </ItemGroup>
- </Project>
++</Project>