diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue10949.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue10949.cs
new file mode 100644
index 00000000000..d2b98464cd0
--- /dev/null
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue10949.cs
@@ -0,0 +1,51 @@
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+using System;
+using System.Collections.ObjectModel;
+
+#if UITEST
+using Xamarin.Forms.Core.UITests;
+using Xamarin.UITest;
+using NUnit.Framework;
+#endif
+
+namespace Xamarin.Forms.Controls.Issues
+{
+
+#if UITEST
+	[Category(UITestCategories.ActivityIndicator)]
+#endif
+
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Github, 10949, "UWP replace Progressbar with ProgressRing", PlatformAffected.UWP)]
+	public class Issue10949 : ContentPage
+	{
+		public Issue10949()
+		{
+			var loadingLabel = new Label
+			{
+				Text = "Loading"
+			};
+
+			var activityIndicator = new ActivityIndicator()
+			{
+				IsRunning = true,
+				IsVisible = true,
+				WidthRequest = 100,
+				HeightRequest = 100,
+				Color = Color.Red,
+				BackgroundColor = Color.Yellow
+			};
+			// Build the page.
+			Content = new StackLayout
+			{
+				Orientation = StackOrientation.Vertical,
+				Children =
+				{
+				     loadingLabel,
+					activityIndicator
+				}
+			};
+		}
+	}
+}
diff --git a/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
index 15cf629313f..20be7de861e 100644
--- a/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,6 +9,7 @@
     <Import_RootNamespace>Xamarin.Forms.Controls.Issues</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Issue10949.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)CollectionViewGroupTypeIssue.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Github9536.xaml.cs">
     <DependentUpon>Github9536.xaml</DependentUpon>
diff --git a/Xamarin.Forms.Platform.UAP/ActivityIndicatorRenderer.cs b/Xamarin.Forms.Platform.UAP/ActivityIndicatorRenderer.cs
index 547c6bb47e4..aa1995ef0aa 100644
--- a/Xamarin.Forms.Platform.UAP/ActivityIndicatorRenderer.cs
+++ b/Xamarin.Forms.Platform.UAP/ActivityIndicatorRenderer.cs
@@ -1,9 +1,10 @@
 using System.ComponentModel;
 using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
 
 namespace Xamarin.Forms.Platform.UWP
 {
-	public class ActivityIndicatorRenderer : ViewRenderer<ActivityIndicator, FormsProgressBar>
+	public class ActivityIndicatorRenderer : ViewRenderer<ActivityIndicator, ProgressRing>
 	{
 		object _foregroundDefault;
 
@@ -15,7 +16,13 @@ protected override void OnElementChanged(ElementChangedEventArgs<ActivityIndicat
 			{
 				if (Control == null)
 				{
-					SetNativeControl(new FormsProgressBar { IsIndeterminate = true, Style = Windows.UI.Xaml.Application.Current.Resources["FormsProgressBarStyle"] as Windows.UI.Xaml.Style });
+					SetNativeControl(
+						new ProgressRing
+						{
+							IsActive = Element.IsRunning,
+							Visibility = Element.IsVisible ? Windows.UI.Xaml.Visibility.Visible : Visibility.Collapsed,
+							IsEnabled = Element.IsEnabled
+						});
 
 					Control.Loaded += OnControlLoaded;
 				}
@@ -29,7 +36,8 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 		{
 			base.OnElementPropertyChanged(sender, e);
 
-			if (e.PropertyName == ActivityIndicator.IsRunningProperty.PropertyName || e.PropertyName == VisualElement.OpacityProperty.PropertyName)
+			if (e.PropertyName == ActivityIndicator.IsRunningProperty.PropertyName ||
+			    e.PropertyName == VisualElement.OpacityProperty.PropertyName)
 				UpdateIsRunning();
 			else if (e.PropertyName == ActivityIndicator.ColorProperty.PropertyName)
 				UpdateColor();
@@ -57,7 +65,7 @@ void UpdateColor()
 
 		void UpdateIsRunning()
 		{
-			Control.ElementOpacity = Element.IsRunning ? Element.Opacity : 0;
+			Control.Opacity = Element.IsRunning ? Element.Opacity : 0;
 		}
 	}
 }
\ No newline at end of file
diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/ItemContentControl.cs b/Xamarin.Forms.Platform.UAP/CollectionView/ItemContentControl.cs
index 4d4ee7e9f0a..a924eee9355 100644
--- a/Xamarin.Forms.Platform.UAP/CollectionView/ItemContentControl.cs
+++ b/Xamarin.Forms.Platform.UAP/CollectionView/ItemContentControl.cs
@@ -9,6 +9,7 @@ namespace Xamarin.Forms.Platform.UWP
 {
 	public class ItemContentControl : ContentControl
 	{
+		View _view;
 		IVisualElementRenderer _renderer;
 
 		public ItemContentControl()
@@ -17,7 +18,7 @@ public ItemContentControl()
 		}
 
 		public static readonly DependencyProperty FormsDataTemplateProperty = DependencyProperty.Register(
-			nameof(FormsDataTemplate), typeof(DataTemplate), typeof(ItemContentControl), 
+			nameof(FormsDataTemplate), typeof(DataTemplate), typeof(ItemContentControl),
 			new PropertyMetadata(default(DataTemplate), FormsDataTemplateChanged));
 
 		static void FormsDataTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -38,7 +39,7 @@ public DataTemplate FormsDataTemplate
 		}
 
 		public static readonly DependencyProperty FormsDataContextProperty = DependencyProperty.Register(
-			nameof(FormsDataContext), typeof(object), typeof(ItemContentControl), 
+			nameof(FormsDataContext), typeof(object), typeof(ItemContentControl),
 			new PropertyMetadata(default(object), FormsDataContextChanged));
 
 		static void FormsDataContextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -103,15 +104,11 @@ protected override void OnContentChanged(object oldContent, object newContent)
 		{
 			base.OnContentChanged(oldContent, newContent);
 
-			if (oldContent is FrameworkElement oldElement)
-			{
-				oldElement.Loaded -= ContentLoaded;
-			}
+			if (oldContent != null && _view != null)
+				_view.MeasureInvalidated -= OnViewMeasureInvalidated;
 
-			if (newContent is FrameworkElement newElement)
-			{
-				newElement.Loaded += ContentLoaded;
-			}
+			if (newContent != null && _view != null)
+				_view.MeasureInvalidated += OnViewMeasureInvalidated;
 		}
 
 		internal void Realize()
@@ -132,14 +129,14 @@ internal void Realize()
 				return;
 			}
 
-			var view = FormsDataTemplate.CreateContent(dataContext, container) as View;
-			view.BindingContext = dataContext;
-			_renderer = Platform.CreateRenderer(view);
-			Platform.SetRenderer(view, _renderer);
+			_view = FormsDataTemplate.CreateContent(dataContext, container) as View;
+			_view.BindingContext = dataContext;
+			_renderer = Platform.CreateRenderer(_view);
+			Platform.SetRenderer(_view, _renderer);
 
 			Content = _renderer.ContainerElement;
 
-			itemsView?.AddLogicalChild(view);
+			itemsView?.AddLogicalChild(_view);
 		}
 
 		internal void UpdateIsSelected(bool isSelected)
@@ -154,7 +151,7 @@ internal void UpdateIsSelected(bool isSelected)
 				: VisualStateManager.CommonStates.Normal);
 		}
 
-		void ContentLoaded(object sender, RoutedEventArgs e)
+		void OnViewMeasureInvalidated(object sender, EventArgs e)
 		{
 			InvalidateMeasure();
 		}
diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/ItemsViewRenderer.cs b/Xamarin.Forms.Platform.UAP/CollectionView/ItemsViewRenderer.cs
index e843711844f..a6776d64c4b 100644
--- a/Xamarin.Forms.Platform.UAP/CollectionView/ItemsViewRenderer.cs
+++ b/Xamarin.Forms.Platform.UAP/CollectionView/ItemsViewRenderer.cs
@@ -2,13 +2,16 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Threading.Tasks;
+
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Data;
+
 using Xamarin.Forms.Internals;
+
+using UwpApp = Windows.UI.Xaml.Application;
+using UwpDataTemplate = Windows.UI.Xaml.DataTemplate;
 using UwpScrollBarVisibility = Windows.UI.Xaml.Controls.ScrollBarVisibility;
-using UWPApp = Windows.UI.Xaml.Application;
-using UWPDataTemplate = Windows.UI.Xaml.DataTemplate;
 
 namespace Xamarin.Forms.Platform.UWP
 {
@@ -27,8 +30,8 @@ public abstract class ItemsViewRenderer<TItemsView> : ViewRenderer<TItemsView, L
 		internal double _previousVerticalOffset;
 
 		protected ListViewBase ListViewBase { get; private set; }
-		protected UWPDataTemplate ViewTemplate => (UWPDataTemplate)UWPApp.Current.Resources["View"];
-		protected UWPDataTemplate ItemsViewTemplate => (UWPDataTemplate)UWPApp.Current.Resources["ItemsViewDefaultTemplate"];
+		protected UwpDataTemplate ViewTemplate => (UwpDataTemplate)UwpApp.Current.Resources["View"];
+		protected UwpDataTemplate ItemsViewTemplate => (UwpDataTemplate)UwpApp.Current.Resources["ItemsViewDefaultTemplate"];
 
 		protected ItemsViewRenderer()
 		{
@@ -392,6 +395,31 @@ protected virtual void UpdateEmptyView()
 			UpdateEmptyViewVisibility();
 		}
 
+		protected virtual void UpdateItemsLayout()
+		{
+			if (_scrollViewer != null)
+				_scrollViewer.ViewChanged -= OnScrollViewChanged;
+
+			if (ListViewBase != null)
+			{
+				ListViewBase.ItemsSource = null;
+				ListViewBase = null;
+			}
+
+			ListViewBase = SelectListViewBase();
+			ListViewBase.IsSynchronizedWithCurrentItem = false;
+
+			FindScrollViewer(ListViewBase);
+
+			SetNativeControl(ListViewBase);
+
+			UpdateItemTemplate();
+			UpdateItemsSource();
+			UpdateVerticalScrollBarVisibility();
+			UpdateHorizontalScrollBarVisibility();
+			UpdateEmptyView();
+		}
+
 		FrameworkElement RealizeEmptyViewTemplate(object bindingContext, DataTemplate emptyViewTemplate)
 		{
 			if (emptyViewTemplate == null)
@@ -499,4 +527,4 @@ void OnScrollViewChanged(object sender, ScrollViewerViewChangedEventArgs e)
 			HandleScroll(_scrollViewer);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/StructuredItemsViewRenderer.cs b/Xamarin.Forms.Platform.UAP/CollectionView/StructuredItemsViewRenderer.cs
index fa41e03fffe..44f98a6dd5f 100644
--- a/Xamarin.Forms.Platform.UAP/CollectionView/StructuredItemsViewRenderer.cs
+++ b/Xamarin.Forms.Platform.UAP/CollectionView/StructuredItemsViewRenderer.cs
@@ -1,6 +1,8 @@
 using System;
 using System.ComponentModel;
+
 using Windows.UI.Xaml.Controls;
+
 using UWPApp = Windows.UI.Xaml.Application;
 using WListView = Windows.UI.Xaml.Controls.ListView;
 using WScrollMode = Windows.UI.Xaml.Controls.ScrollMode;
@@ -43,6 +45,10 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 			{
 				UpdateFooter();
 			}
+			else if (changedProperty.Is(StructuredItemsView.ItemsLayoutProperty))
+			{
+				UpdateItemsLayout();
+			}
 		}
 
 		protected override ListViewBase SelectListViewBase()
@@ -57,7 +63,7 @@ protected override ListViewBase SelectListViewBase()
 					return CreateHorizontalListView(listItemsLayout);
 			}
 
-			throw new NotImplementedException("The layout is not implemented");			
+			throw new NotImplementedException("The layout is not implemented");
 		}
 
 		protected virtual void UpdateHeader()
diff --git a/Xamarin.Forms.Platform.UAP/FormsProgressBar.cs b/Xamarin.Forms.Platform.UAP/FormsProgressBar.cs
deleted file mode 100644
index 83e10fc19ec..00000000000
--- a/Xamarin.Forms.Platform.UAP/FormsProgressBar.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Windows.UI.Xaml;
-
-namespace Xamarin.Forms.Platform.UWP
-{
-	public class FormsProgressBar : Windows.UI.Xaml.Controls.ProgressBar
-	{
-		public static readonly DependencyProperty ElementOpacityProperty = DependencyProperty.Register(
-			nameof(ElementOpacity), typeof(double), typeof(FormsProgressBar), new PropertyMetadata(default(double)));
-
-		public double ElementOpacity
-		{
-			get { return (double)GetValue(ElementOpacityProperty); }
-			set { SetValue(ElementOpacityProperty, value); }
-		}
-
-		protected override Windows.Foundation.Size MeasureOverride(Windows.Foundation.Size availableSize)
-		{
-			var result = base.MeasureOverride(availableSize);
-			if (!double.IsInfinity(availableSize.Width))
-				result.Width = availableSize.Width;
-			return result;
-		}
-	}
-}
diff --git a/Xamarin.Forms.Platform.UAP/FormsProgressBarStyle.xaml b/Xamarin.Forms.Platform.UAP/FormsProgressBarStyle.xaml
deleted file mode 100644
index 1d2ea194e7c..00000000000
--- a/Xamarin.Forms.Platform.UAP/FormsProgressBarStyle.xaml
+++ /dev/null
@@ -1,308 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:uwp="using:Xamarin.Forms.Platform.UWP">
-	
-	<!-- Default style for Windows.UI.Xaml.Controls.ProgressBar -->
-	<Style x:Key="FormsProgressBarStyle" TargetType="uwp:FormsProgressBar">
-		<Setter Property="Foreground" Value="{ThemeResource SystemControlHighlightAccentBrush}" />
-		<Setter Property="Background" Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
-		<Setter Property="BorderThickness" Value="{ThemeResource ProgressBarBorderThemeThickness}" />
-		<Setter Property="Maximum" Value="100" />
-		<Setter Property="MinHeight" Value="{ThemeResource ProgressBarThemeMinHeight}" />
-		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ProgressBar">
-					<Grid>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition From="Updating" To="Determinate">
-										<Storyboard>
-											<RepositionThemeAnimation TargetName="ProgressBarIndicator" FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.IndicatorLengthDelta}" />
-										</Storyboard>
-									</VisualTransition>
-									<VisualTransition From="Paused" To="Determinate">
-										<Storyboard>
-											<DoubleAnimation Storyboard.TargetName="ProgressBarIndicator"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1"
-                                     Duration="0:0:0.25" />
-										</Storyboard>
-									</VisualTransition>
-									<VisualTransition From="Indeterminate" To="Determinate">
-										<Storyboard>
-											<FadeInThemeAnimation TargetName="EllipseGrid" />
-										</Storyboard>
-									</VisualTransition>
-								</VisualStateGroup.Transitions>
-								<VisualState x:Name="Determinate" />
-								<VisualState x:Name="Updating" />
-								<VisualState x:Name="Indeterminate">
-									<Storyboard RepeatBehavior="Forever">
-										<DoubleAnimation Storyboard.TargetName="EllipseGrid"
-                                   Duration="0:0:3.917"
-                                   Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
-                                   From="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ContainerAnimationStartPosition}"
-                                   To="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ContainerAnimationEndPosition}" />
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)" Storyboard.TargetName="E1">
-											<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-											<SplineDoubleKeyFrame KeyTime="0:0:1" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationWellPosition}" KeySpline="0.4,0,0.6,1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:2" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationWellPosition}" />
-											<SplineDoubleKeyFrame KeyTime="0:0:3" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationEndPosition}" KeySpline="0.4,0,0.6,1" />
-										</DoubleAnimationUsingKeyFrames>
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)" Storyboard.TargetName="E2">
-											<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.167" Value="0" />
-											<SplineDoubleKeyFrame KeyTime="0:0:1.167" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationWellPosition}" KeySpline="0.4,0,0.6,1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:2.167" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationWellPosition}" />
-											<SplineDoubleKeyFrame KeyTime="0:0:3.167" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationEndPosition}" KeySpline="0.4,0,0.6,1" />
-										</DoubleAnimationUsingKeyFrames>
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)" Storyboard.TargetName="E3">
-											<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.333" Value="0" />
-											<SplineDoubleKeyFrame KeyTime="0:0:1.333" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationWellPosition}" KeySpline="0.4,0,0.6,1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:2.333" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationWellPosition}" />
-											<SplineDoubleKeyFrame KeyTime="0:0:3.333" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationEndPosition}" KeySpline="0.4,0,0.6,1" />
-										</DoubleAnimationUsingKeyFrames>
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)" Storyboard.TargetName="E4">
-											<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="0" />
-											<SplineDoubleKeyFrame KeyTime="0:0:1.5" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationWellPosition}" KeySpline="0.4,0,0.6,1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:2.5" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationWellPosition}" />
-											<SplineDoubleKeyFrame KeyTime="0:0:3.5" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationEndPosition}" KeySpline="0.4,0,0.6,1" />
-										</DoubleAnimationUsingKeyFrames>
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)" Storyboard.TargetName="E5">
-											<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.667" Value="0" />
-											<SplineDoubleKeyFrame KeyTime="0:0:1.667" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationWellPosition}" KeySpline="0.4,0,0.6,1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:2.667" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationWellPosition}" />
-											<SplineDoubleKeyFrame KeyTime="0:0:3.667" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseAnimationEndPosition}" KeySpline="0.4,0,0.6,1" />
-										</DoubleAnimationUsingKeyFrames>
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)" Storyboard.TargetName="B1">
-											<EasingDoubleKeyFrame KeyTime="0" Value="-50" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:2" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3" Value="100" />
-										</DoubleAnimationUsingKeyFrames>
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)" Storyboard.TargetName="B2">
-											<EasingDoubleKeyFrame KeyTime="0" Value="-50" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.667" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:2.167" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3.167" Value="100" />
-										</DoubleAnimationUsingKeyFrames>
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)" Storyboard.TargetName="B3">
-											<EasingDoubleKeyFrame KeyTime="0" Value="-50" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.833" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:2.333" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3.333" Value="100" />
-										</DoubleAnimationUsingKeyFrames>
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)" Storyboard.TargetName="B4">
-											<EasingDoubleKeyFrame KeyTime="0" Value="-50" />
-											<EasingDoubleKeyFrame KeyTime="0:0:1" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:2.5" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3.5" Value="100" />
-										</DoubleAnimationUsingKeyFrames>
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)" Storyboard.TargetName="B5">
-											<EasingDoubleKeyFrame KeyTime="0" Value="-50" />
-											<EasingDoubleKeyFrame KeyTime="0:0:1.167" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:2.667" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3.667" Value="100" />
-										</DoubleAnimationUsingKeyFrames>
-										<!-- The ElementOpacity on FormsProgressBar is used in place of Opacity so that the user may specify
-											 a particular value they might wish to use, and also prevents unintended interactions between
-											 Element.Opacity and Control.Opacity. -->
-										<DoubleAnimation Storyboard.TargetName="EllipseGrid"
-                                   Storyboard.TargetProperty="Opacity"
-                                   To="{Binding ElementOpacity, RelativeSource={RelativeSource TemplatedParent}}"
-                                   Duration="0" />
-										<!-- Both FadeOutThemeAnimation and a DoubleAnimation on Opacity are necessary
-                                           here.  The FadeOutThemeAnimation is necessary in the Indeterminate state so
-                                           that we can do a FadeInThemeAnimation when transitioning back to the
-                                           Determinate state.  The DoubleAnimation on Opacity is necessary to hide the
-                                           DeterminateRoot immediately so that it does not slowly fade out during each
-                                           iteration of the Indeterminate state animation. -->
-										<FadeOutThemeAnimation TargetName="DeterminateRoot" />
-										<DoubleAnimation Storyboard.TargetName="DeterminateRoot"
-                                   Storyboard.TargetProperty="Opacity"
-                                   To="0"
-                                   Duration="0" />
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="E1">
-											<EasingDoubleKeyFrame KeyTime="0" Value="1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3" Value="1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3" Value="0" />
-										</DoubleAnimationUsingKeyFrames>
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="E2">
-											<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.167" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.167" Value="1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3.167" Value="1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3.167" Value="0" />
-										</DoubleAnimationUsingKeyFrames>
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="E3">
-											<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.333" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.333" Value="1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3.333" Value="1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3.333" Value="0" />
-										</DoubleAnimationUsingKeyFrames>
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="E4">
-											<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3.5" Value="1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3.5" Value="0" />
-										</DoubleAnimationUsingKeyFrames>
-										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="E5">
-											<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.667" Value="0" />
-											<EasingDoubleKeyFrame KeyTime="0:0:0.667" Value="1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3.667" Value="1" />
-											<EasingDoubleKeyFrame KeyTime="0:0:3.667" Value="0" />
-										</DoubleAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Error">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ProgressBarIndicator">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="0" />
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Paused">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ProgressBarIndicator"
-                                             Storyboard.TargetProperty="Fill">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlForegroundAccentBrush}" />
-										</ObjectAnimationUsingKeyFrames>
-										<DoubleAnimation Storyboard.TargetName="ProgressBarIndicator"
-                                   Storyboard.TargetProperty="Opacity"
-                                   To="{ThemeResource ProgressBarIndicatorPauseOpacity}"
-                                   Duration="0:0:0.25" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-						<Grid x:Name="EllipseGrid"
-                Opacity="0">
-							<Grid.RenderTransform>
-								<TranslateTransform />
-							</Grid.RenderTransform>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="Auto" />
-							</Grid.ColumnDefinitions>
-							<Border x:Name="B1"
-                    Grid.Column="8"
-                    RenderTransformOrigin="0.5,0.5">
-								<Border.RenderTransform>
-									<TranslateTransform />
-								</Border.RenderTransform>
-								<Ellipse x:Name="E1"
-                       Fill="{TemplateBinding Foreground}"
-                       Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseDiameter}"
-                       Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseDiameter}"
-                       RenderTransformOrigin="0.5,0.5">
-									<Ellipse.RenderTransform>
-										<TranslateTransform />
-									</Ellipse.RenderTransform>
-								</Ellipse>
-							</Border>
-							<Rectangle Grid.Column="7"
-                       Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseOffset}" />
-							<Border x:Name="B2"
-                    Grid.Column="6"
-                    RenderTransformOrigin="0.5,0.5">
-								<Border.RenderTransform>
-									<TranslateTransform />
-								</Border.RenderTransform>
-								<Ellipse x:Name="E2"
-                       Fill="{TemplateBinding Foreground}"
-                       Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseDiameter}"
-                       Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseDiameter}"
-                       RenderTransformOrigin="0.5,0.5">
-									<Ellipse.RenderTransform>
-										<TranslateTransform />
-									</Ellipse.RenderTransform>
-								</Ellipse>
-							</Border>
-							<Rectangle Grid.Column="5"
-                       Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseOffset}" />
-							<Border x:Name="B3"
-                    Grid.Column="4"
-                    RenderTransformOrigin="0.5,0.5">
-								<Border.RenderTransform>
-									<TranslateTransform />
-								</Border.RenderTransform>
-								<Ellipse x:Name="E3"
-                       Fill="{TemplateBinding Foreground}"
-                       Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseDiameter}"
-                       Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseDiameter}"
-                       RenderTransformOrigin="0.5,0.5">
-									<Ellipse.RenderTransform>
-										<TranslateTransform />
-									</Ellipse.RenderTransform>
-								</Ellipse>
-							</Border>
-							<Rectangle Grid.Column="3"
-                       Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseOffset}" />
-							<Border x:Name="B4"
-                    Grid.Column="2"
-                    RenderTransformOrigin="0.5,0.5">
-								<Border.RenderTransform>
-									<TranslateTransform />
-								</Border.RenderTransform>
-								<Ellipse x:Name="E4"
-                       Fill="{TemplateBinding Foreground}"
-                       Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseDiameter}"
-                       Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseDiameter}"
-                       RenderTransformOrigin="0.5,0.5">
-									<Ellipse.RenderTransform>
-										<TranslateTransform />
-									</Ellipse.RenderTransform>
-								</Ellipse>
-							</Border>
-							<Rectangle Grid.Column="1"
-                       Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseOffset}" />
-							<Border x:Name="B5"
-                    Grid.Column="0"
-                    RenderTransformOrigin="0.5,0.5">
-								<Border.RenderTransform>
-									<TranslateTransform />
-								</Border.RenderTransform>
-								<Ellipse x:Name="E5"
-                       Fill="{TemplateBinding Foreground}"
-                       Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseDiameter}"
-                       Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.EllipseDiameter}"
-                       RenderTransformOrigin="0.5,0.5">
-									<Ellipse.RenderTransform>
-										<TranslateTransform />
-									</Ellipse.RenderTransform>
-								</Ellipse>
-							</Border>
-						</Grid>
-						<Border x:Name="DeterminateRoot"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-							<Rectangle x:Name="ProgressBarIndicator"
-                       Margin="{TemplateBinding Padding}"
-                       Fill="{TemplateBinding Foreground}"
-                       HorizontalAlignment="Left" />
-						</Border>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-</ResourceDictionary>
diff --git a/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj b/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
index 7513b7686a0..0482cdfd6ba 100644
--- a/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
+++ b/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
@@ -48,10 +48,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="FormsProgressBarStyle.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="FormsTextBoxStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>