Merge branch '3.4.0' into 3.5.0

diff --cc azure-pipelines.yml
index 17cc4bb,1c917bf..a7eda3d
--- 1/azure-pipelines.yml
--- 2/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@@ -8,27 -8,23 +8,23 @@@ variables
  - name: Suffix
    value: ''
  - name: major
-   value: 4
+   value: 3
  - name: minor
-   value: 0
 -  value: 4
++  value: 5
  - name: patch
-   value: 1
+   value: 0
  - name: buildversion
-   value: $[counter('versioncounter', 1000)]
- - name: sign
-   value: 'false'
- - name: provisioning
-   value: 'true'
- - name: AppleCodesignIdentity
-   value: ''
- - name: AppleCodesignIdentityUrl
-   value: ''
- - name: AppleCodesignProfileUrl
-   value: ''
- - name: ProvisionatorExecutablePath
-   value: 'Xamarin.Forms.Build/provisionator.sh'
+   value: $[counter('$(Build.SourceBranchName)_counter', 1)]
  - group: Xamarin.Forms
  - group: XQA Secrets
+ - group: xamops-azdev-secrets
+ 
+ resources:
+   repositories:
+     - repository: xamarin-templates
+       type: github
+       name: xamarin/yaml-templates
+       endpoint: xamarin
  
  trigger:
    branches:

diff --cc build/steps/build-osx.yml
index 62a26b5,ffed023..31b80e5
--- 1/build/steps/build-osx.yml
--- 2/build/steps/build-osx.yml
+++ b/build/steps/build-osx.yml
@@@ -47,62 -49,9 +49,8 @@@ steps
      inputs:
        solutionFile: Xamarin.Forms.sln
        configuration: '$(BuildConfiguration)'
 -      runNugetRestore: true
  
  
-   - task: MSBuild@1
-     displayName: 'Build Android [Legacy Renderers]'
-     inputs:
-       solution: Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
-       configuration: '$(BuildConfiguration)'
-       msbuildArguments: '/t:"Rebuild;SignAndroidPackage"'
- 
- 
-   - task: CopyFiles@2
-     displayName: 'Copy  [Legacy Renderers]'
-     inputs:
-       SourceFolder: Xamarin.Forms.ControlGallery.Android/bin/Debug/
-       Contents: '**/*.apk'
-       TargetFolder: Xamarin.Forms.ControlGallery.Android/legacyRenderers/
-       CleanTargetFolder: true
-       OverWrite: true
- 
- 
-   - task: MSBuild@1
-     displayName: 'Build Android [Fast Renderers]'
-     inputs:
-       solution: Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
-       configuration: '$(BuildConfiguration)'
-       msbuildArguments: '/t:"Rebuild;SignAndroidPackage" /p:DefineConstants="TRACE DEBUG TEST_EXPERIMENTAL_RENDERERS APP"'
- 
- 
-   - task: CopyFiles@2
-     displayName: 'Copy [Fast Renderers]'
-     inputs:
-       SourceFolder: Xamarin.Forms.ControlGallery.Android/bin/Debug/
-       Contents: '**/*.apk'
-       TargetFolder: Xamarin.Forms.ControlGallery.Android/newRenderers/
-       CleanTargetFolder: true
-       OverWrite: true
- 
- 
-   - task: MSBuild@1
-     displayName: 'Build Android [Pre-AppCompat]'
-     inputs:
-       solution: Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
-       configuration: '$(BuildConfiguration)'
-       msbuildArguments: '/t:"Rebuild;SignAndroidPackage" /p:DefineConstants="TRACE DEBUG FORMS_APPLICATION_ACTIVITY APP"'
- 
- 
-   - task: CopyFiles@2
-     displayName: 'Copy  [Pre-AppCompat]'
-     inputs:
-       SourceFolder: Xamarin.Forms.ControlGallery.Android/bin/Debug/
-       Contents: '**/*.apk'
-       TargetFolder: Xamarin.Forms.ControlGallery.Android/preAppCompat/
-       CleanTargetFolder: true
-       OverWrite: true
- 
- 
    - task: CopyFiles@2
      displayName: 'Copy test-cloud.exe'
      inputs: