diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AccessibilityTraitsSetCorrectlyNone.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AccessibilityTraitsSetCorrectlyNone.png
new file mode 100644
index 000000000000..81787a00f89b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AccessibilityTraitsSetCorrectlyNone.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ActionModeMenuShouldNotBeVisibleAfterSwitchingTab.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ActionModeMenuShouldNotBeVisibleAfterSwitchingTab.png
new file mode 100644
index 000000000000..6ff7b6b879ba
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ActionModeMenuShouldNotBeVisibleAfterSwitchingTab.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AddItemsToCarouselViewWorks.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AddItemsToCarouselViewWorks.png
new file mode 100644
index 000000000000..1299c9e51c0b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AddItemsToCarouselViewWorks.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AddShadowRuntime.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AddShadowRuntime.png
new file mode 100644
index 000000000000..c53beecce440
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AddShadowRuntime.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AllScreenIsBlack.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AllScreenIsBlack.png
new file mode 100644
index 000000000000..a3720dddb88b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AllScreenIsBlack.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AppThemeShouldChangeDarkTheme.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AppThemeShouldChangeDarkTheme.png
new file mode 100644
index 000000000000..f361b179a4bd
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/AppThemeShouldChangeDarkTheme.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BackButtonBehaviorIsVisibleWorksWithCustomIcon.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BackButtonBehaviorIsVisibleWorksWithCustomIcon.png
new file mode 100644
index 000000000000..944d8a1f9712
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BackButtonBehaviorIsVisibleWorksWithCustomIcon.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BackgroundFrameResizesFastAndCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BackgroundFrameResizesFastAndCorrectly.png
new file mode 100644
index 000000000000..0835a4feea43
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BackgroundFrameResizesFastAndCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BackgroundGradientsShouldRenderCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BackgroundGradientsShouldRenderCorrectly.png
new file mode 100644
index 000000000000..99c3f754e9b8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BackgroundGradientsShouldRenderCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BindingOnStrokeShapeWithRadius.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BindingOnStrokeShapeWithRadius.png
new file mode 100644
index 000000000000..17acf9a8f97c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BindingOnStrokeShapeWithRadius.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BlankScreenOnNavigationBack.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BlankScreenOnNavigationBack.png
new file mode 100644
index 000000000000..357b96a81ed7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BlankScreenOnNavigationBack.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderBackgroundSizeUpdatesWhenRotatingScreen.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderBackgroundSizeUpdatesWhenRotatingScreen.png
new file mode 100644
index 000000000000..a373dae0e613
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderBackgroundSizeUpdatesWhenRotatingScreen.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderColorShouldChange.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderColorShouldChange.png
new file mode 100644
index 000000000000..4f0c97e36830
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderColorShouldChange.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderRoundRectangleWithImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderRoundRectangleWithImage.png
new file mode 100644
index 000000000000..540e38b5caec
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderRoundRectangleWithImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderShouldHaveNoThickness.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderShouldHaveNoThickness.png
new file mode 100644
index 000000000000..0885b9ae6cd9
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderShouldHaveNoThickness.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderWidthAffectsTheImageSizingOriginal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderWidthAffectsTheImageSizingOriginal.png
new file mode 100644
index 000000000000..3aad7b6e7d2d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderWidthAffectsTheImageSizingOriginal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png
new file mode 100644
index 000000000000..5fba13aaf608
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BottomTabColorTest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BottomTabColorTest.png
new file mode 100644
index 000000000000..54e9b2f22a52
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BottomTabColorTest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bottom_SwipeItems.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bottom_SwipeItems.png
new file mode 100644
index 000000000000..d61ad80b9845
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bottom_SwipeItems.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_ColorWithOpacity.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_ColorWithOpacity.png
new file mode 100644
index 000000000000..17a37ce028e2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_ColorWithOpacity.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_ColorWithOpacityAndShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_ColorWithOpacityAndShadow.png
new file mode 100644
index 000000000000..220e9003c545
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_ColorWithOpacityAndShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_CornerRadiusWithColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_CornerRadiusWithColor.png
new file mode 100644
index 000000000000..690dd66fe681
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_CornerRadiusWithColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_CornerRadiusWithColorAndShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_CornerRadiusWithColorAndShadow.png
new file mode 100644
index 000000000000..f71c3e59f524
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_CornerRadiusWithColorAndShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_CornerRadiusWithFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_CornerRadiusWithFlowDirection.png
new file mode 100644
index 000000000000..f561e96722fc
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_CornerRadiusWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_CornerRadiusWithOpacityAndShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_CornerRadiusWithOpacityAndShadow.png
new file mode 100644
index 000000000000..87dbb7f7cf85
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_CornerRadiusWithOpacityAndShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_IsVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_IsVisible.png
new file mode 100644
index 000000000000..c7c431151912
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/BoxView_IsVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bugzilla29128Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bugzilla29128Test.png
new file mode 100644
index 000000000000..d4a8a5a39e62
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bugzilla29128Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bugzilla30166Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bugzilla30166Test.png
new file mode 100644
index 000000000000..374a1e16a532
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bugzilla30166Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bugzilla36802Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bugzilla36802Test.png
new file mode 100644
index 000000000000..6b5dec58c3b3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bugzilla36802Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bugzilla53834Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bugzilla53834Test.png
new file mode 100644
index 000000000000..288077d4dfd5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Bugzilla53834Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonLayoutResizesWithImagePositionTop.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonLayoutResizesWithImagePositionTop.png
new file mode 100644
index 000000000000..7f7efc1c4957
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonLayoutResizesWithImagePositionTop.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonPaddingIsAddedWhenNeeded.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonPaddingIsAddedWhenNeeded.png
new file mode 100644
index 000000000000..195dd8963a84
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonPaddingIsAddedWhenNeeded.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonResizesWhenTitleOrImageChangesOriginal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonResizesWhenTitleOrImageChangesOriginal.png
new file mode 100644
index 000000000000..e01077e57d8b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonResizesWhenTitleOrImageChangesOriginal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonTitleFillsSpaceWhenImageChangesOriginal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonTitleFillsSpaceWhenImageChangesOriginal.png
new file mode 100644
index 000000000000..8f14e56d08e1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonTitleFillsSpaceWhenImageChangesOriginal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetBorderColorAndTextColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetBorderColorAndTextColor_VerifyVisualState.png
new file mode 100644
index 000000000000..7b40bf8a9341
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetBorderColorAndTextColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetBorderWidthEntryAndLineBreakMode_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetBorderWidthEntryAndLineBreakMode_VerifyVisualState.png
new file mode 100644
index 000000000000..8eed8bf6a2d6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetBorderWidthEntryAndLineBreakMode_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetCharacterSpacingAndText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetCharacterSpacingAndText_VerifyVisualState.png
new file mode 100644
index 000000000000..3b0fd3e0e5e3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetCharacterSpacingAndText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetCornerRadiusAndBorderWidth_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetCornerRadiusAndBorderWidth_VerifyVisualState.png
new file mode 100644
index 000000000000..fbd0a1df65e4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetCornerRadiusAndBorderWidth_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeCharacterWrap_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeCharacterWrap_VerifyVisualState.png
new file mode 100644
index 000000000000..14db61ae0ba3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeCharacterWrap_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeHeadTruncation_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeHeadTruncation_VerifyVisualState.png
new file mode 100644
index 000000000000..06fc628beb89
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeHeadTruncation_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeMiddleTruncation_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeMiddleTruncation_VerifyVisualState.png
new file mode 100644
index 000000000000..a6cb0b798a27
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeMiddleTruncation_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeTailTruncation_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeTailTruncation_VerifyVisualState.png
new file mode 100644
index 000000000000..2a29f7558ce4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeTailTruncation_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeWordWrap_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeWordWrap_VerifyVisualState.png
new file mode 100644
index 000000000000..2e0e03bd81db
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_SetLineBreakModeWordWrap_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontAttributesAndFontFamily_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontAttributesAndFontFamily_VerifyVisualState.png
new file mode 100644
index 000000000000..460665a5804b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontAttributesAndFontFamily_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontAttributesAndTextTransform_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontAttributesAndTextTransform_VerifyVisualState.png
new file mode 100644
index 000000000000..769f6c565f18
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontAttributesAndTextTransform_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontAttributesAndText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontAttributesAndText_VerifyVisualState.png
new file mode 100644
index 000000000000..fe21bfacce04
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontAttributesAndText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontFamilyAndTextTransform_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontFamilyAndTextTransform_VerifyVisualState.png
new file mode 100644
index 000000000000..8e1b8af18114
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontFamilyAndTextTransform_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontFamilyAndText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontFamilyAndText_VerifyVisualState.png
new file mode 100644
index 000000000000..e764482ae785
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontFamilyAndText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontSizeAndLineBreakMode_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontSizeAndLineBreakMode_VerifyVisualState.png
new file mode 100644
index 000000000000..11bdf0b1f065
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontSizeAndLineBreakMode_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontSizeAndTextTransform_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontSizeAndTextTransform_VerifyVisualState.png
new file mode 100644
index 000000000000..3f6657c34387
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontSizeAndTextTransform_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontSizeAndText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontSizeAndText_VerifyVisualState.png
new file mode 100644
index 000000000000..714915cc188b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setFontSizeAndText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setPaddingAndText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setPaddingAndText_VerifyVisualState.png
new file mode 100644
index 000000000000..4dc0c4a91299
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setPaddingAndText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setShadowAndText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setShadowAndText_VerifyVisualState.png
new file mode 100644
index 000000000000..ad864ad99994
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setShadowAndText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setTextAndTextColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setTextAndTextColor_VerifyVisualState.png
new file mode 100644
index 000000000000..42f573749fe1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Button_setTextAndTextColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png
new file mode 100644
index 000000000000..09e6facf1543
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CVHorizontalLinearItemsLayoutItemSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CVHorizontalLinearItemsLayoutItemSpacing.png
new file mode 100644
index 000000000000..a14fb0b19658
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CVHorizontalLinearItemsLayoutItemSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CanvasShouldHonorBlur.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CanvasShouldHonorBlur.png
new file mode 100644
index 000000000000..5c6888835b28
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CanvasShouldHonorBlur.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselItemLoadsInCorrectPosition.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselItemLoadsInCorrectPosition.png
new file mode 100644
index 000000000000..9391333fac04
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselItemLoadsInCorrectPosition.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselItemsShouldRenderProperly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselItemsShouldRenderProperly.png
new file mode 100644
index 000000000000..1f67d9ea1228
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselItemsShouldRenderProperly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselViewItemShouldScaleProperly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselViewItemShouldScaleProperly.png
new file mode 100644
index 000000000000..9bc34fc466a8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselViewItemShouldScaleProperly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselViewItemsShouldRenderVertically.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselViewItemsShouldRenderVertically.png
new file mode 100644
index 000000000000..91fb087ea71e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselViewItemsShouldRenderVertically.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselViewShouldRenderCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselViewShouldRenderCorrectly.png
new file mode 100644
index 000000000000..38ec21b5c0c2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselViewShouldRenderCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselViewShouldScrollToRightPosition.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselViewShouldScrollToRightPosition.png
new file mode 100644
index 000000000000..246f5ed514e5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CarouselViewShouldScrollToRightPosition.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ChangeShellContentTitle.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ChangeShellContentTitle.png
new file mode 100644
index 000000000000..2abc3ca080e8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ChangeShellContentTitle.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CheckBox_ChangeColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CheckBox_ChangeColor_VerifyVisualState.png
new file mode 100644
index 000000000000..05c1bcb78575
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CheckBox_ChangeColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CheckBox_SetIsCheckedAndColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CheckBox_SetIsCheckedAndColor_VerifyVisualState.png
new file mode 100644
index 000000000000..7f6d1301ad66
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CheckBox_SetIsCheckedAndColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CheckNavigationBreaksVisualStatesForPicker.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CheckNavigationBreaksVisualStatesForPicker.png
new file mode 100644
index 000000000000..c50da015ded6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CheckNavigationBreaksVisualStatesForPicker.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ChildFlexLayoutContentShouldAppear.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ChildFlexLayoutContentShouldAppear.png
new file mode 100644
index 000000000000..18c6bd5d5e23
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ChildFlexLayoutContentShouldAppear.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ClearButtonVisiblityButton_TextEmpty.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ClearButtonVisiblityButton_TextEmpty.png
new file mode 100644
index 000000000000..08c8343bd164
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ClearButtonVisiblityButton_TextEmpty.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ClearButtonVisiblityButton_TextPresent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ClearButtonVisiblityButton_TextPresent.png
new file mode 100644
index 000000000000..5bfbba41efeb
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ClearButtonVisiblityButton_TextPresent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewAddGroupWhenViewIsEmpty.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewAddGroupWhenViewIsEmpty.png
new file mode 100644
index 000000000000..e641ffb36919
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewAddGroupWhenViewIsEmpty.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewDuplicateViewsWhenAddItemToGroup.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewDuplicateViewsWhenAddItemToGroup.png
new file mode 100644
index 000000000000..21ab8b806a2b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewDuplicateViewsWhenAddItemToGroup.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewEmptyViewFillsAvailableSpaceByDefault.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewEmptyViewFillsAvailableSpaceByDefault.png
new file mode 100644
index 000000000000..7db4865ff497
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewEmptyViewFillsAvailableSpaceByDefault.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewGroupFooterTemplateShouldNotCrash.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewGroupFooterTemplateShouldNotCrash.png
new file mode 100644
index 000000000000..1139e22b1184
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewGroupFooterTemplateShouldNotCrash.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewHeaderBlankWhenLastItemRemoved.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewHeaderBlankWhenLastItemRemoved.png
new file mode 100644
index 000000000000..8d5d37bb480a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewHeaderBlankWhenLastItemRemoved.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewHeaderSizewithIsVisibleBinding.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewHeaderSizewithIsVisibleBinding.png
new file mode 100644
index 000000000000..483b55f98c99
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewHeaderSizewithIsVisibleBinding.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewHorizontalItemSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewHorizontalItemSpacing.png
new file mode 100644
index 000000000000..5d6ffb2fcb52
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewHorizontalItemSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewMeasureFirstItem.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewMeasureFirstItem.png
new file mode 100644
index 000000000000..a299623b8582
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewMeasureFirstItem.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewPreSelectionShouldUpdate.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewPreSelectionShouldUpdate.png
new file mode 100644
index 000000000000..dae554586a77
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewPreSelectionShouldUpdate.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewSelectedItemBackgroundShouldPersistAfterModalNavigation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewSelectedItemBackgroundShouldPersistAfterModalNavigation.png
new file mode 100644
index 000000000000..c975efdfd091
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewSelectedItemBackgroundShouldPersistAfterModalNavigation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewShouldHaveScrollBar.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewShouldHaveScrollBar.png
new file mode 100644
index 000000000000..bea5b6463e52
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewShouldHaveScrollBar.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewSingleItemAlignmentWithFooter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewSingleItemAlignmentWithFooter.png
new file mode 100644
index 000000000000..733e93661f6a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionViewSingleItemAlignmentWithFooter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionviewFooterHideswhenDynamicallyAddorRemoveItems.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionviewFooterHideswhenDynamicallyAddorRemoveItems.png
new file mode 100644
index 000000000000..c3351ea7c326
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CollectionviewFooterHideswhenDynamicallyAddorRemoveItems.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ContentPageBackgroundImageSourceWorks.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ContentPageBackgroundImageSourceWorks.png
new file mode 100644
index 000000000000..bd98f7bbe0fc
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ContentPageBackgroundImageSourceWorks.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CustomBackButtonShouldBeRed.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CustomBackButtonShouldBeRed.png
new file mode 100644
index 000000000000..2070263021c7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CustomBackButtonShouldBeRed.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CustomStyleEditorFromPlatformViewWorks.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CustomStyleEditorFromPlatformViewWorks.png
new file mode 100644
index 000000000000..8538c1970145
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/CustomStyleEditorFromPlatformViewWorks.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePickerShouldDisplayProperSelectedDate.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePickerShouldDisplayProperSelectedDate.png
new file mode 100644
index 000000000000..ebe9795c8e1d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePickerShouldDisplayProperSelectedDate.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePickerTextColorShouldUpdate.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePickerTextColorShouldUpdate.png
new file mode 100644
index 000000000000..fbde2c13d1c2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePickerTextColorShouldUpdate.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_DateSelectedEvent_FiresOnDateChange.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_DateSelectedEvent_FiresOnDateChange.png
new file mode 100644
index 000000000000..a9cdcfe79b53
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_DateSelectedEvent_FiresOnDateChange.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_Format_D_LongDatePattern.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_Format_D_LongDatePattern.png
new file mode 100644
index 000000000000..87d8b2c9ddea
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_Format_D_LongDatePattern.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_Format_F_FullDateLongTime.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_Format_F_FullDateLongTime.png
new file mode 100644
index 000000000000..093d17ea8e13
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_Format_F_FullDateLongTime.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_Format_f_FullDateShortTime.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_Format_f_FullDateShortTime.png
new file mode 100644
index 000000000000..8319f2ae502a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_Format_f_FullDateShortTime.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_InitialState_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_InitialState_VerifyVisualState.png
new file mode 100644
index 000000000000..9caff601bd26
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_InitialState_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetCharacterSpacingAndDate_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetCharacterSpacingAndDate_VerifyVisualState.png
new file mode 100644
index 000000000000..8f749a53f78e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetCharacterSpacingAndDate_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndFlowDirection_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndFlowDirection_VerifyVisualState.png
new file mode 100644
index 000000000000..c56e89b50178
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndFlowDirection_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndIsEnabled_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndIsEnabled_VerifyVisualState.png
new file mode 100644
index 000000000000..4873624d189d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndIsEnabled_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndIsVisible_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndIsVisible_VerifyVisualState.png
new file mode 100644
index 000000000000..4c5e0bbffd19
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndIsVisible_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndShadowOpacity_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndShadowOpacity_VerifyVisualState.png
new file mode 100644
index 000000000000..84d044614aea
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndShadowOpacity_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndTextColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndTextColor_VerifyVisualState.png
new file mode 100644
index 000000000000..848458cb517d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetDateAndTextColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontAttributesAndFontFamily_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontAttributesAndFontFamily_VerifyVisualState.png
new file mode 100644
index 000000000000..e236126d8464
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontAttributesAndFontFamily_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontAttributesAndFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontAttributesAndFontSize_VerifyVisualState.png
new file mode 100644
index 000000000000..20045fb77367
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontAttributesAndFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontAttributesAndFormat_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontAttributesAndFormat_VerifyVisualState.png
new file mode 100644
index 000000000000..06a67d322dd6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontAttributesAndFormat_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontAttributesAndFormat_f_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontAttributesAndFormat_f_VerifyVisualState.png
new file mode 100644
index 000000000000..73fb5e039d07
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontAttributesAndFormat_f_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontFamilyAndFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontFamilyAndFontSize_VerifyVisualState.png
new file mode 100644
index 000000000000..53d29ceb645f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontFamilyAndFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontFamilyAndFormat_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontFamilyAndFormat_VerifyVisualState.png
new file mode 100644
index 000000000000..1e8062a2c1dd
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontFamilyAndFormat_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontFamilyAndFormat_f_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontFamilyAndFormat_f_VerifyVisualState.png
new file mode 100644
index 000000000000..b5cfe45da2b2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontFamilyAndFormat_f_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontSizeAndFormat_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontSizeAndFormat_VerifyVisualState.png
new file mode 100644
index 000000000000..805bc32e63eb
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontSizeAndFormat_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontSizeAndFormat_f_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontSizeAndFormat_f_VerifyVisualState.png
new file mode 100644
index 000000000000..03c51ab161e5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetFontSizeAndFormat_f_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetMaximumDateAndDate_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetMaximumDateAndDate_VerifyVisualState.png
new file mode 100644
index 000000000000..b82630864643
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetMaximumDateAndDate_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetMinimumDateAndDate_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetMinimumDateAndDate_VerifyVisualState.png
new file mode 100644
index 000000000000..7ad5d7d38c69
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DatePicker_SetMinimumDateAndDate_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DefaultSelectedTabTextColorShouldApplyProperly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DefaultSelectedTabTextColorShouldApplyProperly.png
new file mode 100644
index 000000000000..a5d600b23e18
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DefaultSelectedTabTextColorShouldApplyProperly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DynamicFontImageSourceColorShouldApplyOnBottomTabIconOnAndroid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DynamicFontImageSourceColorShouldApplyOnBottomTabIconOnAndroid.png
new file mode 100644
index 000000000000..019106e83a05
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DynamicFontImageSourceColorShouldApplyOnBottomTabIconOnAndroid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DynamicFontImageSourceColorShouldApplyOnTabIcon.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DynamicFontImageSourceColorShouldApplyOnTabIcon.png
new file mode 100644
index 000000000000..4a937e0fd73e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DynamicFontImageSourceColorShouldApplyOnTabIcon.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DynamicTabSectionVisibility.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DynamicTabSectionVisibility.png
new file mode 100644
index 000000000000..67a903f0d6a7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/DynamicTabSectionVisibility.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EditorBackgroundWorks.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EditorBackgroundWorks.png
new file mode 100644
index 000000000000..f0b911fb879e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EditorBackgroundWorks.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EditorIsReadOnlyPreventModify.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EditorIsReadOnlyPreventModify.png
new file mode 100644
index 000000000000..2608467ed6da
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EditorIsReadOnlyPreventModify.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EditorPlaceholderPosition.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EditorPlaceholderPosition.png
new file mode 100644
index 000000000000..25ad6b7acb43
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EditorPlaceholderPosition.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EntryClearButtonColorShouldMatchTextColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EntryClearButtonColorShouldMatchTextColor.png
new file mode 100644
index 000000000000..3fdc7a1648fe
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EntryClearButtonColorShouldMatchTextColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EntryIsPasswordObscureText.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EntryIsPasswordObscureText.png
new file mode 100644
index 000000000000..5c3794d36a51
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EntryIsPasswordObscureText.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EntrySelectionLengthRuntimeUpdate.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EntrySelectionLengthRuntimeUpdate.png
new file mode 100644
index 000000000000..937106b10eaf
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EntrySelectionLengthRuntimeUpdate.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png
new file mode 100644
index 000000000000..219e777ebcb2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FlyoutItemTextShouldDisplayProperly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FlyoutItemTextShouldDisplayProperly.png
new file mode 100644
index 000000000000..966eaf758940
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FlyoutItemTextShouldDisplayProperly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FlyoutMenuShouldNotDisappearWhenNavigateUsingServices.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FlyoutMenuShouldNotDisappearWhenNavigateUsingServices.png
new file mode 100644
index 000000000000..027316c91f0e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FlyoutMenuShouldNotDisappearWhenNavigateUsingServices.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FontImageSourceColorShouldApplyOnBottomTabIconOnAndroid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FontImageSourceColorShouldApplyOnBottomTabIconOnAndroid.png
new file mode 100644
index 000000000000..91f069cf1954
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FontImageSourceColorShouldApplyOnBottomTabIconOnAndroid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FontImageSourceColorShouldApplyOnTabIcon.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FontImageSourceColorShouldApplyOnTabIcon.png
new file mode 100644
index 000000000000..2722596b08ef
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FontImageSourceColorShouldApplyOnTabIcon.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FooterWithEmptyCVShouldHaveCorrectSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FooterWithEmptyCVShouldHaveCorrectSize.png
new file mode 100644
index 000000000000..bb60f7b94705
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FooterWithEmptyCVShouldHaveCorrectSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FrameCornerRadiusShouldnotChange.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FrameCornerRadiusShouldnotChange.png
new file mode 100644
index 000000000000..3859851725f5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FrameCornerRadiusShouldnotChange.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FromBundle_Image.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FromBundle_Image.png
new file mode 100644
index 000000000000..16c715583fba
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FromBundle_Image.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FromBundle_Label.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FromBundle_Label.png
new file mode 100644
index 000000000000..15c607f9f3e4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FromBundle_Label.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FromEmbedded_Image.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FromEmbedded_Image.png
new file mode 100644
index 000000000000..2122e238b0ca
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FromEmbedded_Image.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FromEmbedded_Label.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FromEmbedded_Label.png
new file mode 100644
index 000000000000..ea471c2290ef
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/FromEmbedded_Label.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GradientAndShadowShouldWork.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GradientAndShadowShouldWork.png
new file mode 100644
index 000000000000..185a68f5c74c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GradientAndShadowShouldWork.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GradientInTabBarShouldChange.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GradientInTabBarShouldChange.png
new file mode 100644
index 000000000000..2f373542af38
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GradientInTabBarShouldChange.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GradientLayerShouldApplyProperly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GradientLayerShouldApplyProperly.png
new file mode 100644
index 000000000000..2540cac9b09f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GradientLayerShouldApplyProperly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsViewShouldNotWrapText.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsViewShouldNotWrapText.png
new file mode 100644
index 000000000000..7bf2099fcf64
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsViewShouldNotWrapText.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_EllipseDrawable_VerifyTypeAndRendering.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_EllipseDrawable_VerifyTypeAndRendering.png
new file mode 100644
index 000000000000..622ca843d4f7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_EllipseDrawable_VerifyTypeAndRendering.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_InvalidateButton_ChangesColorAndLogsEvent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_InvalidateButton_ChangesColorAndLogsEvent.png
new file mode 100644
index 000000000000..cae334609c0b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_InvalidateButton_ChangesColorAndLogsEvent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_LineDrawable_VerifyTypeAndRendering.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_LineDrawable_VerifyTypeAndRendering.png
new file mode 100644
index 000000000000..5e8603f3f45b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_LineDrawable_VerifyTypeAndRendering.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_SetInvalidShadowProperties_VerifyGracefulHandling.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_SetInvalidShadowProperties_VerifyGracefulHandling.png
new file mode 100644
index 000000000000..e54db22655db
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_SetInvalidShadowProperties_VerifyGracefulHandling.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_SetShadowProperties_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_SetShadowProperties_VerifyVisualState.png
new file mode 100644
index 000000000000..431b5bd92061
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_SetShadowProperties_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_SetVisibilityToTrue_VerifyVisibleState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_SetVisibilityToTrue_VerifyVisibleState.png
new file mode 100644
index 000000000000..1faea6bbbdbf
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_SetVisibilityToTrue_VerifyVisibleState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_SquareDrawable_VerifyTypeAndRendering.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_SquareDrawable_VerifyTypeAndRendering.png
new file mode 100644
index 000000000000..9f62ca9556dd
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_SquareDrawable_VerifyTypeAndRendering.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_StringDrawable_VerifyTypeAndRendering.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_StringDrawable_VerifyTypeAndRendering.png
new file mode 100644
index 000000000000..a9ee5d639533
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_StringDrawable_VerifyTypeAndRendering.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_TriangleDrawable_VerifyTypeAndRendering.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_TriangleDrawable_VerifyTypeAndRendering.png
new file mode 100644
index 000000000000..3786b061285c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_TriangleDrawable_VerifyTypeAndRendering.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_TriangleWithCustomDimensions_VerifyState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_TriangleWithCustomDimensions_VerifyState.png
new file mode 100644
index 000000000000..37356103172d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/GraphicsView_TriangleWithCustomDimensions_VerifyState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderAndFooterShouldBeVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderAndFooterShouldBeVisible.png
new file mode 100644
index 000000000000..43d6a8170b71
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderAndFooterShouldBeVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderFooterGridHorizontalWorks.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderFooterGridHorizontalWorks.png
new file mode 100644
index 000000000000..2c143cdd3b7d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderFooterGridHorizontalWorks.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderFooterGridWorks.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderFooterGridWorks.png
new file mode 100644
index 000000000000..6d3bf3798aa7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderFooterGridWorks.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderFooterTemplateWorks.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderFooterTemplateWorks.png
new file mode 100644
index 000000000000..5081e7337399
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderFooterTemplateWorks.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderShouldNotCollapseWithItems.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderShouldNotCollapseWithItems.png
new file mode 100644
index 000000000000..6bd96044baad
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HeaderShouldNotCollapseWithItems.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HorizontalScrollBarShouldHideOnNever.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HorizontalScrollBarShouldHideOnNever.png
new file mode 100644
index 000000000000..ea55e5ade37b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/HorizontalScrollBarShouldHideOnNever.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonPaddingDoesNotChangeWhenIsVisibleChanges.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonPaddingDoesNotChangeWhenIsVisibleChanges.png
new file mode 100644
index 000000000000..7d93856b14a3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonPaddingDoesNotChangeWhenIsVisibleChanges.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonStuckAfterRightClick.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonStuckAfterRightClick.png
new file mode 100644
index 000000000000..ee28ceee453b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonStuckAfterRightClick.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_AspectFill.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_AspectFill.png
new file mode 100644
index 000000000000..5e805a384c2e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_AspectFill.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_AspectFit.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_AspectFit.png
new file mode 100644
index 000000000000..de3da227536d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_AspectFit.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_Center.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_Center.png
new file mode 100644
index 000000000000..7c43c0ceb6b8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_Center.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_Fill.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_Fill.png
new file mode 100644
index 000000000000..7153a28cca40
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_Fill.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_State_AspectFit.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_State_AspectFit.png
new file mode 100644
index 000000000000..bdef0dad8bf8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Aspect_State_AspectFit.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_BorderColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_BorderColor.png
new file mode 100644
index 000000000000..11e13573f19a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_BorderColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_BorderColor_WithBackground.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_BorderColor_WithBackground.png
new file mode 100644
index 000000000000..a8e3dab0f2db
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_BorderColor_WithBackground.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_BorderWidth.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_BorderWidth.png
new file mode 100644
index 000000000000..40fd1d3c1b2d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_BorderWidth.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_BorderWidth_WithBackground.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_BorderWidth_WithBackground.png
new file mode 100644
index 000000000000..f593abde189d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_BorderWidth_WithBackground.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_CornerRadius.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_CornerRadius.png
new file mode 100644
index 000000000000..ba09b9d4ce7a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_CornerRadius.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_CornerRadius_WithBackground.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_CornerRadius_WithBackground.png
new file mode 100644
index 000000000000..5b7a40397dd9
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_CornerRadius_WithBackground.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Padding_Add_Initial.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Padding_Add_Initial.png
new file mode 100644
index 000000000000..b9f3a3e97706
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Padding_Add_Initial.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Padding_Initial.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Padding_Initial.png
new file mode 100644
index 000000000000..9e3bccc5094d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageButtonUITests_Padding_Initial.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageDoesNotDisappearWhenSwitchingTab.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageDoesNotDisappearWhenSwitchingTab.png
new file mode 100644
index 000000000000..bac32f29e5f2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageDoesNotDisappearWhenSwitchingTab.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageSourceInitializesCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageSourceInitializesCorrectly.png
new file mode 100644
index 000000000000..162f9bc499e7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageSourceInitializesCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageUITests_IsAnimationPlaying_No.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageUITests_IsAnimationPlaying_No.png
new file mode 100644
index 000000000000..258930c66437
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageUITests_IsAnimationPlaying_No.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageUITests_Source_FontImageSource_FontAwesome.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageUITests_Source_FontImageSource_FontAwesome.png
new file mode 100644
index 000000000000..959caaa15388
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ImageUITests_Source_FontImageSource_FontAwesome.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/IndicatorViewWithTemplatedIcon.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/IndicatorViewWithTemplatedIcon.png
new file mode 100644
index 000000000000..c8b9ac43a948
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/IndicatorViewWithTemplatedIcon.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/IndicatorWithTemplateShouldBeVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/IndicatorWithTemplateShouldBeVisible.png
new file mode 100644
index 000000000000..c6592bd37a69
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/IndicatorWithTemplateShouldBeVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue10645Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue10645Test.png
new file mode 100644
index 000000000000..a770096fcd33
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue10645Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue1323Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue1323Test.png
new file mode 100644
index 000000000000..79399ac7d111
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue1323Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue13474Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue13474Test.png
new file mode 100644
index 000000000000..f53c854c32b2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue13474Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue15330Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue15330Test.png
new file mode 100644
index 000000000000..6d635cf0b390
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue15330Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue16737Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue16737Test.png
new file mode 100644
index 000000000000..99d9a23ba242
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue16737Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue16918Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue16918Test.png
new file mode 100644
index 000000000000..33aff59c07f7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue16918Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue17366Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue17366Test.png
new file mode 100644
index 000000000000..cc6a8aa5e983
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue17366Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue17400Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue17400Test.png
new file mode 100644
index 000000000000..1926bbfe2ae4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue17400Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue17694Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue17694Test.png
new file mode 100644
index 000000000000..a50919e565ee
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue17694Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue18242Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue18242Test.png
new file mode 100644
index 000000000000..9bdc60e3b440
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue18242Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue18751Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue18751Test.png
new file mode 100644
index 000000000000..a63544a6c372
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue18751Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue18896Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue18896Test.png
new file mode 100644
index 000000000000..cd6eb74194b5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue18896Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue21202Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue21202Test.png
new file mode 100644
index 000000000000..82009b188869
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue21202Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue21394Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue21394Test.png
new file mode 100644
index 000000000000..44aacaf4809a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue21394Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue21513Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue21513Test.png
new file mode 100644
index 000000000000..021c8f56c4dc
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue21513Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue22433_Default.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue22433_Default.png
new file mode 100644
index 000000000000..1dc7c17eae23
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue22433_Default.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue22606_SetHeightTo200.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue22606_SetHeightTo200.png
new file mode 100644
index 000000000000..25d337df5a03
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue22606_SetHeightTo200.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue22899Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue22899Test.png
new file mode 100644
index 000000000000..e5a3342ea2ea
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue22899Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue23674Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue23674Test.png
new file mode 100644
index 000000000000..5d4d5b503376
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue23674Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test.png
new file mode 100644
index 000000000000..0cb3760016ed
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_1.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_1.png
new file mode 100644
index 000000000000..804f23d31c91
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_1.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_2.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_2.png
new file mode 100644
index 000000000000..bd4098857e45
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_2.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_3.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_3.png
new file mode 100644
index 000000000000..640efc631763
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_3.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_4.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_4.png
new file mode 100644
index 000000000000..23b2dfb6ac30
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_4.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_5.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_5.png
new file mode 100644
index 000000000000..80f7193b21c8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue24414Test_5.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue2728TestsItalicLabel.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue2728TestsItalicLabel.png
new file mode 100644
index 000000000000..9dfd2b28f17e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue2728TestsItalicLabel.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue2775Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue2775Test.png
new file mode 100644
index 000000000000..eea0f2ea2824
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue2775Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue28343_ProgressSpinnerDisabled.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue28343_ProgressSpinnerDisabled.png
new file mode 100644
index 000000000000..73e9c4fe42e9
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue28343_ProgressSpinnerDisabled.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue2842Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue2842Test.png
new file mode 100644
index 000000000000..4a50da96cd46
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue2842Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue2951Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue2951Test.png
new file mode 100644
index 000000000000..b8b40ebb6ff5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue2951Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue3342Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue3342Test.png
new file mode 100644
index 000000000000..530e42069eab
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue3342Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue3798Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue3798Test.png
new file mode 100644
index 000000000000..be6e6947301b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue3798Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue3884Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue3884Test.png
new file mode 100644
index 000000000000..6f2c5bd314ed
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue3884Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue6458Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue6458Test.png
new file mode 100644
index 000000000000..d8fa1b389d0f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue6458Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue7823TestIsClippedIssue.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue7823TestIsClippedIssue.png
new file mode 100644
index 000000000000..f9fadab802a8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Issue7823TestIsClippedIssue.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ItemImageSourceShouldBeVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ItemImageSourceShouldBeVisible.png
new file mode 100644
index 000000000000..ac7365eb9dfa
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ItemImageSourceShouldBeVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ItemsLayoutShouldRenderProperlyOnEmptyView.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ItemsLayoutShouldRenderProperlyOnEmptyView.png
new file mode 100644
index 000000000000..14e2d3b2c9a3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ItemsLayoutShouldRenderProperlyOnEmptyView.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelHyperlinkUnderlineColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelHyperlinkUnderlineColor.png
new file mode 100644
index 000000000000..2ba06e2ce858
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelHyperlinkUnderlineColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelShouldSizeProperly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelShouldSizeProperly.png
new file mode 100644
index 000000000000..7d130be03704
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelShouldSizeProperly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelTextDecorationsWorks.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelTextDecorationsWorks.png
new file mode 100644
index 000000000000..66d4e0537273
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelTextDecorationsWorks.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelUITests_FontFamily_FontAwesome.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelUITests_FontFamily_FontAwesome.png
new file mode 100644
index 000000000000..c1c67a07ce60
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelUITests_FontFamily_FontAwesome.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelUITests_FontFamily_Ionicons.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelUITests_FontFamily_Ionicons.png
new file mode 100644
index 000000000000..3b8ba84b99c0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelUITests_FontFamily_Ionicons.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelWithPadding.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelWithPadding.png
new file mode 100644
index 000000000000..30d6eae525d4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LabelWithPadding.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LayoutInHorizontalScrollViewShouldExpand.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LayoutInHorizontalScrollViewShouldExpand.png
new file mode 100644
index 000000000000..f700fa719f35
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LayoutInHorizontalScrollViewShouldExpand.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Left_SwipeItems.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Left_SwipeItems.png
new file mode 100644
index 000000000000..ada79a873812
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Left_SwipeItems.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LoadAndVerifyGif.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LoadAndVerifyGif.png
new file mode 100644
index 000000000000..8a9c96039208
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LoadAndVerifyGif.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LoadAndVerifyJpg.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LoadAndVerifyJpg.png
new file mode 100644
index 000000000000..59cab4d9a59d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LoadAndVerifyJpg.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LoadAndVerifyPng.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LoadAndVerifyPng.png
new file mode 100644
index 000000000000..dd4192c3b71a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LoadAndVerifyPng.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LoadAndVerifySvg.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LoadAndVerifySvg.png
new file mode 100644
index 000000000000..669835473cdd
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/LoadAndVerifySvg.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ModalPageMarginCorrectAfterKeyboardOpens.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ModalPageMarginCorrectAfterKeyboardOpens.png
new file mode 100644
index 000000000000..ec6ef5f2737f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ModalPageMarginCorrectAfterKeyboardOpens.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NavigationBarBackgroundShouldChangeLightTheme.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NavigationBarBackgroundShouldChangeLightTheme.png
new file mode 100644
index 000000000000..78353e9a8e71
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NavigationBarBackgroundShouldChangeLightTheme.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NavigationBetweenFlyoutItems.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NavigationBetweenFlyoutItems.png
new file mode 100644
index 000000000000..561c8b7309f3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NavigationBetweenFlyoutItems.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NavigationPageTitle.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NavigationPageTitle.png
new file mode 100644
index 000000000000..27053c10b4d4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NavigationPageTitle.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NoScrollbarsTest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NoScrollbarsTest.png
new file mode 100644
index 000000000000..8112cd864de7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NoScrollbarsTest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NumberOfToolbarItemsShouldNotIncrease.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NumberOfToolbarItemsShouldNotIncrease.png
new file mode 100644
index 000000000000..c86ed2fc8ebd
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/NumberOfToolbarItemsShouldNotIncrease.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PickerShouldNotAllowUserInputThroughKeyboard.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PickerShouldNotAllowUserInputThroughKeyboard.png
new file mode 100644
index 000000000000..45c720c269fb
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PickerShouldNotAllowUserInputThroughKeyboard.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PickerShouldRegainTitle.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PickerShouldRegainTitle.png
new file mode 100644
index 000000000000..d33e7619411b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PickerShouldRegainTitle.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PickerShouldShowSelectedItemHighlight.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PickerShouldShowSelectedItemHighlight.png
new file mode 100644
index 000000000000..90fbcfa9d591
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PickerShouldShowSelectedItemHighlight.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PickerTitleShouldBeRed.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PickerTitleShouldBeRed.png
new file mode 100644
index 000000000000..4ed7f589cb5b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PickerTitleShouldBeRed.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PlaceholderWithClearButtonVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PlaceholderWithClearButtonVisible.png
new file mode 100644
index 000000000000..4cb9cd620f7d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PlaceholderWithClearButtonVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgrammaticallyOpenedSwipeViewShouldBeVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgrammaticallyOpenedSwipeViewShouldBeVisible.png
new file mode 100644
index 000000000000..3305993e8d08
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgrammaticallyOpenedSwipeViewShouldBeVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_ChangeFlowDirection_RTL_VerifyLabel.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_ChangeFlowDirection_RTL_VerifyLabel.png
new file mode 100644
index 000000000000..f92d5afe2282
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_ChangeFlowDirection_RTL_VerifyLabel.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_ProgressToMethod_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_ProgressToMethod_VerifyVisualState.png
new file mode 100644
index 000000000000..a2234833f24c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_ProgressToMethod_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_SetIsVisibleFalse_VerifyLabel.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_SetIsVisibleFalse_VerifyLabel.png
new file mode 100644
index 000000000000..fc73553de5d1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_SetIsVisibleFalse_VerifyLabel.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_SetProgressColorAndBackgroundColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_SetProgressColorAndBackgroundColor_VerifyVisualState.png
new file mode 100644
index 000000000000..eb894b2c6f97
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_SetProgressColorAndBackgroundColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_SetProgressNegativeValue.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_SetProgressNegativeValue.png
new file mode 100644
index 000000000000..fe4e7e330cca
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_SetProgressNegativeValue.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_SetProgressOutOfRange.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_SetProgressOutOfRange.png
new file mode 100644
index 000000000000..a9b3a378fe62
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_SetProgressOutOfRange.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_ToggleShadow_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_ToggleShadow_VerifyVisualState.png
new file mode 100644
index 000000000000..5bdb8643e499
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ProgressBar_ToggleShadow_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PropertiesShouldBeCorrectlyApplied.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PropertiesShouldBeCorrectlyApplied.png
new file mode 100644
index 000000000000..f9d31f7d16fd
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/PropertiesShouldBeCorrectlyApplied.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButtonContentNotRendering.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButtonContentNotRendering.png
new file mode 100644
index 000000000000..352509f5c67e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButtonContentNotRendering.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButtonShouldApplyPropertiesCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButtonShouldApplyPropertiesCorrectly.png
new file mode 100644
index 000000000000..89f42f93cf49
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButtonShouldApplyPropertiesCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButtonUpdateValueInsideBorderNo.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButtonUpdateValueInsideBorderNo.png
new file mode 100644
index 000000000000..a181a88fd522
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButtonUpdateValueInsideBorderNo.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButtonWithValueChangeSelected.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButtonWithValueChangeSelected.png
new file mode 100644
index 000000000000..8a09d616028e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButtonWithValueChangeSelected.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_Checking_Default_Configuration_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_Checking_Default_Configuration_VerifyVisualState.png
new file mode 100644
index 000000000000..cafa729c77e4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_Checking_Default_Configuration_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_Checking_Initial_Configuration_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_Checking_Initial_Configuration_VerifyVisualState.png
new file mode 100644
index 000000000000..61d7c4c3aa56
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_Checking_Initial_Configuration_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_FlowDirectionAndContent_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_FlowDirectionAndContent_VerifyVisualState.png
new file mode 100644
index 000000000000..bf310b711a6f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_FlowDirectionAndContent_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetContentAndCharacterSpacing_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetContentAndCharacterSpacing_VerifyVisualState.png
new file mode 100644
index 000000000000..07c7df3f9d35
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetContentAndCharacterSpacing_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetContentAndFontAttributes_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetContentAndFontAttributes_VerifyVisualState.png
new file mode 100644
index 000000000000..763d1ab8ac02
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetContentAndFontAttributes_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetContentAndFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetContentAndFontSize_VerifyVisualState.png
new file mode 100644
index 000000000000..48c6d1214e45
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetContentAndFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetContentAndTextColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetContentAndTextColor_VerifyVisualState.png
new file mode 100644
index 000000000000..ca92727ae0f3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetContentAndTextColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetFontAttributesAndTextColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetFontAttributesAndTextColor_VerifyVisualState.png
new file mode 100644
index 000000000000..885b760c7511
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetFontAttributesAndTextColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetFontFamilyAndFontAttributes_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetFontFamilyAndFontAttributes_VerifyVisualState.png
new file mode 100644
index 000000000000..90a6f498404c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetFontFamilyAndFontAttributes_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetFontFamilyAndFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetFontFamilyAndFontSize_VerifyVisualState.png
new file mode 100644
index 000000000000..fbaf3d923270
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetFontFamilyAndFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetFontSizeAndFontAttributes_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetFontSizeAndFontAttributes_VerifyVisualState.png
new file mode 100644
index 000000000000..31956b733a1e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RadioButton_SetFontSizeAndFontAttributes_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ReduceInvalidateMeasuresUpdatingLabel.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ReduceInvalidateMeasuresUpdatingLabel.png
new file mode 100644
index 000000000000..776af743e7d0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ReduceInvalidateMeasuresUpdatingLabel.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RefreshIconDisappearsWhenUserCancelsRefreshByScrollingBackUp.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RefreshIconDisappearsWhenUserCancelsRefreshByScrollingBackUp.png
new file mode 100644
index 000000000000..43e76e7daf2c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RefreshIconDisappearsWhenUserCancelsRefreshByScrollingBackUp.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RefreshShouldNotChangeSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RefreshShouldNotChangeSize.png
new file mode 100644
index 000000000000..60f216c8a1c6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RefreshShouldNotChangeSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RemoveExtraPaddingFromButton.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RemoveExtraPaddingFromButton.png
new file mode 100644
index 000000000000..c995dc2f39de
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RemoveExtraPaddingFromButton.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RemoveShadowRuntime.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RemoveShadowRuntime.png
new file mode 100644
index 000000000000..2b335263843d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/RemoveShadowRuntime.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ReorderBetweenGroupsShouldNotOccurWhenCanMixGroupsIsFalse.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ReorderBetweenGroupsShouldNotOccurWhenCanMixGroupsIsFalse.png
new file mode 100644
index 000000000000..4d625a724c3b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ReorderBetweenGroupsShouldNotOccurWhenCanMixGroupsIsFalse.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ResizeCarouselViewKeepsIndex.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ResizeCarouselViewKeepsIndex.png
new file mode 100644
index 000000000000..620f9253a6f7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ResizeCarouselViewKeepsIndex.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Right_SwipeItems.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Right_SwipeItems.png
new file mode 100644
index 000000000000..55fe45a31f6a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Right_SwipeItems.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollToElement1Start.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollToElement1Start.png
new file mode 100644
index 000000000000..5f8c26a55988
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollToElement1Start.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollToElement2Center.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollToElement2Center.png
new file mode 100644
index 000000000000..e0db98657b22
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollToElement2Center.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollToElement3End.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollToElement3End.png
new file mode 100644
index 000000000000..109ceead6be2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollToElement3End.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollToLastItem.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollToLastItem.png
new file mode 100644
index 000000000000..86641a83a15b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollToLastItem.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollViewGradientBackground.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollViewGradientBackground.png
new file mode 100644
index 000000000000..54fe65d80987
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollViewGradientBackground.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollViewShouldRenderWithinBounds.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollViewShouldRenderWithinBounds.png
new file mode 100644
index 000000000000..6a884bf1bffe
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollViewShouldRenderWithinBounds.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollViewWithoutGradientBackground.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollViewWithoutGradientBackground.png
new file mode 100644
index 000000000000..2127bc95c376
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ScrollViewWithoutGradientBackground.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBarMaxLength.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBarMaxLength.png
new file mode 100644
index 000000000000..a333d26dfef2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBarMaxLength.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_InitialState_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_InitialState_VerifyVisualState.png
new file mode 100644
index 000000000000..c5acedfecf85
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_InitialState_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetCancelButtonAndTextColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetCancelButtonAndTextColor_VerifyVisualState.png
new file mode 100644
index 000000000000..2a4569c1bf39
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetCancelButtonAndTextColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndFontFamily_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndFontFamily_VerifyVisualState.png
new file mode 100644
index 000000000000..e7a275a5aede
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndFontFamily_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndFontSize_VerifyVisualState.png
new file mode 100644
index 000000000000..25b04433d8f8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndPlaceholderText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndPlaceholderText_VerifyVisualState.png
new file mode 100644
index 000000000000..1af898909c5b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndPlaceholderText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndTextTransform_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndTextTransform_VerifyVisualState.png
new file mode 100644
index 000000000000..c598e44e09ce
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndTextTransform_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndText_VerifyVisualState.png
new file mode 100644
index 000000000000..d7c2fd38a3f6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontAttributesAndText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontFamilyAndFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontFamilyAndFontSize_VerifyVisualState.png
new file mode 100644
index 000000000000..68bbd41c8d2e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontFamilyAndFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontFamilyAndPlaceholder_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontFamilyAndPlaceholder_VerifyVisualState.png
new file mode 100644
index 000000000000..7ce01f507675
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontFamilyAndPlaceholder_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontFamilyAndText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontFamilyAndText_VerifyVisualState.png
new file mode 100644
index 000000000000..327030cc794d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontFamilyAndText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontSizeAndPlaceholder_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontSizeAndPlaceholder_VerifyVisualState.png
new file mode 100644
index 000000000000..9f24e5820e54
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontSizeAndPlaceholder_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontSizeAndText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontSizeAndText_VerifyVisualState.png
new file mode 100644
index 000000000000..63d4c60abba0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetFontSizeAndText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetHorizontalTextAlignmentAndPlaceholder_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetHorizontalTextAlignmentAndPlaceholder_VerifyVisualState.png
new file mode 100644
index 000000000000..bdb25227b7d3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetHorizontalTextAlignmentAndPlaceholder_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetHorizontalTextAlignmentAndText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetHorizontalTextAlignmentAndText_VerifyVisualState.png
new file mode 100644
index 000000000000..57493ce8b3ac
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetHorizontalTextAlignmentAndText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetHorizontalTextAlignmentAndVerticalTextAlignment_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetHorizontalTextAlignmentAndVerticalTextAlignment_VerifyVisualState.png
new file mode 100644
index 000000000000..801bcb0fae03
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetHorizontalTextAlignmentAndVerticalTextAlignment_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetPlaceholderAndCharacterSpacing_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetPlaceholderAndCharacterSpacing_VerifyVisualState.png
new file mode 100644
index 000000000000..08018e94f2d5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetPlaceholderAndCharacterSpacing_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetPlaceholderAndPlaceholderColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetPlaceholderAndPlaceholderColor_VerifyVisualState.png
new file mode 100644
index 000000000000..45f591e9c907
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetPlaceholderAndPlaceholderColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetPlaceholderAndVerticalTextAlignment_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetPlaceholderAndVerticalTextAlignment_VerifyVisualState.png
new file mode 100644
index 000000000000..58053988fa62
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetPlaceholderAndVerticalTextAlignment_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetPlaceholderColorAndTextColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetPlaceholderColorAndTextColor_VerifyVisualState.png
new file mode 100644
index 000000000000..370f93579bac
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetPlaceholderColorAndTextColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetShadow_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetShadow_VerifyVisualState.png
new file mode 100644
index 000000000000..ddc828a5ebfa
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetShadow_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetTextAndCharacterSpacing_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetTextAndCharacterSpacing_VerifyVisualState.png
new file mode 100644
index 000000000000..5aa5e25d046d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetTextAndCharacterSpacing_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetTextAndVerticalTextAlignment_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetTextAndVerticalTextAlignment_VerifyVisualState.png
new file mode 100644
index 000000000000..2d21cc35b291
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchBar_SetTextAndVerticalTextAlignment_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchHandlerRendersCustomSearchIconAndClearIcon.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchHandlerRendersCustomSearchIconAndClearIcon.png
new file mode 100644
index 000000000000..ea793e8b99c9
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchHandlerRendersCustomSearchIconAndClearIcon.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchHandlerRendersDefaultSearchIconAndClearIcon.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchHandlerRendersDefaultSearchIconAndClearIcon.png
new file mode 100644
index 000000000000..a2ded111215e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SearchHandlerRendersDefaultSearchIconAndClearIcon.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SelectedItemVisualIsCleared.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SelectedItemVisualIsCleared.png
new file mode 100644
index 000000000000..444fc5e2dbc2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SelectedItemVisualIsCleared.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SelectedTabIconShouldChangeColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SelectedTabIconShouldChangeColor.png
new file mode 100644
index 000000000000..4808f063a925
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SelectedTabIconShouldChangeColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SelectionShouldNotMovedToTopWithGroupedCollection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SelectionShouldNotMovedToTopWithGroupedCollection.png
new file mode 100644
index 000000000000..52a2c250adf7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SelectionShouldNotMovedToTopWithGroupedCollection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingDatePickerBackgroundFromHandler.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingDatePickerBackgroundFromHandler.png
new file mode 100644
index 000000000000..f7c81879c7e5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingDatePickerBackgroundFromHandler.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingEditorBackgroundFromHandler.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingEditorBackgroundFromHandler.png
new file mode 100644
index 000000000000..35cd0dcb75e5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingEditorBackgroundFromHandler.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingEntryBackgroundFromHandler.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingEntryBackgroundFromHandler.png
new file mode 100644
index 000000000000..cfe7f4ea8cb5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingEntryBackgroundFromHandler.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingMaximumTrackColorOnSliderWorks.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingMaximumTrackColorOnSliderWorks.png
new file mode 100644
index 000000000000..6e072f21c0d5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingMaximumTrackColorOnSliderWorks.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingTimePickerBackgroundFromHandler.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingTimePickerBackgroundFromHandler.png
new file mode 100644
index 000000000000..bb93d6e5f833
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SettingTimePickerBackgroundFromHandler.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowAddClip.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowAddClip.png
new file mode 100644
index 000000000000..fc72c0beadf8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowAddClip.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowRemoveClip.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowRemoveClip.png
new file mode 100644
index 000000000000..d8fcdebfa497
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowRemoveClip.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowShouldUpdate.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowShouldUpdate.png
new file mode 100644
index 000000000000..5ca6cf018f37
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowShouldUpdate.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowShouldUpdateWhenClipping.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowShouldUpdateWhenClipping.png
new file mode 100644
index 000000000000..4de448eac2a1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowShouldUpdateWhenClipping.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowUpdateColor1.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowUpdateColor1.png
new file mode 100644
index 000000000000..235289c2d8b9
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowUpdateColor1.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowUpdateColor2.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowUpdateColor2.png
new file mode 100644
index 000000000000..068dc201282f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowUpdateColor2.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_AddClip_VerifyShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_AddClip_VerifyShadow.png
new file mode 100644
index 000000000000..1206191988a7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_AddClip_VerifyShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_ChangeFlowDirection_RTL_VerifyScreenshot.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_ChangeFlowDirection_RTL_VerifyScreenshot.png
new file mode 100644
index 000000000000..f6e1ef13ddd1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_ChangeFlowDirection_RTL_VerifyScreenshot.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_Remove_AtRuntime.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_Remove_AtRuntime.png
new file mode 100644
index 000000000000..fe92629a8220
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_Remove_AtRuntime.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetColor.png
new file mode 100644
index 000000000000..0e83fb0ba82f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetEnabledStateToFalse_VerifyScreenshot.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetEnabledStateToFalse_VerifyScreenshot.png
new file mode 100644
index 000000000000..d83cceee0d0a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetEnabledStateToFalse_VerifyScreenshot.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetOffset_PositiveValues.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetOffset_PositiveValues.png
new file mode 100644
index 000000000000..5a9f9fb397af
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetOffset_PositiveValues.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetOffset_Zero.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetOffset_Zero.png
new file mode 100644
index 000000000000..c45ab2f77b7e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetOffset_Zero.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetOpacity.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetOpacity.png
new file mode 100644
index 000000000000..d247a8f01681
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetOpacity.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetOpacity_Zero.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetOpacity_Zero.png
new file mode 100644
index 000000000000..5695acee633d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetOpacity_Zero.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetRadius.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetRadius.png
new file mode 100644
index 000000000000..1428ccfb32a2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetRadius.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetRadius_Zero.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetRadius_Zero.png
new file mode 100644
index 000000000000..889532b452b3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetRadius_Zero.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetVisibilityToFalse_VerifyScreenshot.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetVisibilityToFalse_VerifyScreenshot.png
new file mode 100644
index 000000000000..80031cb31c13
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Shadow_SetVisibilityToFalse_VerifyScreenshot.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowsDontRespectControlShape.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowsDontRespectControlShape.png
new file mode 100644
index 000000000000..462a3da5bec4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShadowsDontRespectControlShape.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShellFlowDirectionUpdate.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShellFlowDirectionUpdate.png
new file mode 100644
index 000000000000..7db30dddd00c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShellFlowDirectionUpdate.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldFlyoutTextWrapsInLandscape.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldFlyoutTextWrapsInLandscape.png
new file mode 100644
index 000000000000..5e693fa87698
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldFlyoutTextWrapsInLandscape.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldHideCustomFlyoutIconWhenNavigatingToPageWithDisabledFlyout.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldHideCustomFlyoutIconWhenNavigatingToPageWithDisabledFlyout.png
new file mode 100644
index 000000000000..818d2f9abca2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldHideCustomFlyoutIconWhenNavigatingToPageWithDisabledFlyout.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldIgnoreBottomContentInsetForCollectionViewItems.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldIgnoreBottomContentInsetForCollectionViewItems.png
new file mode 100644
index 000000000000..de1d20b9e4b1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldIgnoreBottomContentInsetForCollectionViewItems.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldUpdateButtonShadowWithTransparentColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldUpdateButtonShadowWithTransparentColor.png
new file mode 100644
index 000000000000..eb03355ba564
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldUpdateButtonShadowWithTransparentColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldUpdateSearchHandlerOnPageNavigation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldUpdateSearchHandlerOnPageNavigation.png
new file mode 100644
index 000000000000..704eb8e47e37
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ShouldUpdateSearchHandlerOnPageNavigation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SingleItemAlignmentInCollectionViewHorizontalGridLayout.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SingleItemAlignmentInCollectionViewHorizontalGridLayout.png
new file mode 100644
index 000000000000..53f15deb0a8f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SingleItemAlignmentInCollectionViewHorizontalGridLayout.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SliderShouldChangeThumbImageAndResetIt.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SliderShouldChangeThumbImageAndResetIt.png
new file mode 100644
index 000000000000..94c9771807f4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SliderShouldChangeThumbImageAndResetIt.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeBackgroundColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeBackgroundColor_VerifyVisualState.png
new file mode 100644
index 000000000000..b3d65d4afcc4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeBackgroundColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeFlowDirection_RTL_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeFlowDirection_RTL_VerifyVisualState.png
new file mode 100644
index 000000000000..254f64233c46
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeFlowDirection_RTL_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeMaxTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeMaxTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..7a2149026927
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeMaxTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeMinTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeMinTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..37cf572b655b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeMinTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeThumbColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeThumbColor_VerifyVisualState.png
new file mode 100644
index 000000000000..32baa3ad3f0d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeThumbColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeThumbImageSource_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeThumbImageSource_VerifyVisualState.png
new file mode 100644
index 000000000000..da41bce2f979
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_ChangeThumbImageSource_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_FlowDirection_RTL_SetMaximumValue_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_FlowDirection_RTL_SetMaximumValue_VerifyVisualState.png
new file mode 100644
index 000000000000..cb24db729a0e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_FlowDirection_RTL_SetMaximumValue_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_FlowDirection_RTL_SetMinimumValue_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_FlowDirection_RTL_SetMinimumValue_VerifyVisualState.png
new file mode 100644
index 000000000000..66dd33beca3e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_FlowDirection_RTL_SetMinimumValue_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_FlowDirection_RTL_SetValue_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_FlowDirection_RTL_SetValue_VerifyVisualState.png
new file mode 100644
index 000000000000..393fc62807e7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_FlowDirection_RTL_SetValue_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetBackgroundColorAndIsEnable_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetBackgroundColorAndIsEnable_VerifyVisualState.png
new file mode 100644
index 000000000000..ccbe4f799f8b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetBackgroundColorAndIsEnable_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetBackgroundColorAndMaxTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetBackgroundColorAndMaxTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..b692df816965
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetBackgroundColorAndMaxTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetBackgroundColorAndMinTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetBackgroundColorAndMinTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..a1b01571ed22
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetBackgroundColorAndMinTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetBackgroundColorAndThumbColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetBackgroundColorAndThumbColor_VerifyVisualState.png
new file mode 100644
index 000000000000..b178b40c4337
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetBackgroundColorAndThumbColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetEnabledStateToFalse_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetEnabledStateToFalse_VerifyVisualState.png
new file mode 100644
index 000000000000..ffc17aa52516
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetEnabledStateToFalse_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetFlowDirectionAndMaxTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetFlowDirectionAndMaxTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..ad7955296d45
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetFlowDirectionAndMaxTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetFlowDirectionAndMinTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetFlowDirectionAndMinTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..73593467da40
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetFlowDirectionAndMinTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsEnableAndBackgroundColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsEnableAndBackgroundColor_VerifyVisualState.png
new file mode 100644
index 000000000000..b7eac1dc9c0c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsEnableAndBackgroundColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsEnableAndMaxTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsEnableAndMaxTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..3280516be1c5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsEnableAndMaxTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsEnableAndMinTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsEnableAndMinTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..94a807dc0669
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsEnableAndMinTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsEnableAndThumbColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsEnableAndThumbColor_VerifyVisualState.png
new file mode 100644
index 000000000000..8fd8c87c39ff
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsEnableAndThumbColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsVisibleAndBackgroundColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsVisibleAndBackgroundColor_VerifyVisualState.png
new file mode 100644
index 000000000000..26832263c259
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsVisibleAndBackgroundColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsVisibleAndMaxTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsVisibleAndMaxTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..c7a450da368f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsVisibleAndMaxTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsVisibleAndMinTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsVisibleAndMinTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..13402f5acf06
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsVisibleAndMinTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsVisibleAndThumbColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsVisibleAndThumbColor_VerifyVisualState.png
new file mode 100644
index 000000000000..20ec2d13408e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetIsVisibleAndThumbColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackAndBackgroundColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackAndBackgroundColor_VerifyVisualState.png
new file mode 100644
index 000000000000..7f9279b809fb
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackAndBackgroundColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackAndMinTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackAndMinTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..4a33b5ce33c9
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackAndMinTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackAndThumbColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackAndThumbColor_VerifyVisualState.png
new file mode 100644
index 000000000000..518115a4e671
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackAndThumbColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackColorAndValue_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackColorAndValue_VerifyVisualState.png
new file mode 100644
index 000000000000..ee262abcb5c8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackColorAndValue_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackColorTestFlowDirection_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackColorTestFlowDirection_VerifyVisualState.png
new file mode 100644
index 000000000000..b1c3db4cfd25
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaxTrackColorTestFlowDirection_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaximumAndChangeFlowDirection_RTL.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaximumAndChangeFlowDirection_RTL.png
new file mode 100644
index 000000000000..4bd15c224a91
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMaximumAndChangeFlowDirection_RTL.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackAndBackgroundColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackAndBackgroundColor_VerifyVisualState.png
new file mode 100644
index 000000000000..29e24886661d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackAndBackgroundColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackAndMaxTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackAndMaxTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..35df84a8fa40
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackAndMaxTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackAndThumbColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackAndThumbColor_VerifyVisualState.png
new file mode 100644
index 000000000000..cfab88797708
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackAndThumbColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackColorAndValue_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackColorAndValue_VerifyVisualState.png
new file mode 100644
index 000000000000..50d7ce6d6682
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackColorAndValue_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackColorTestFlowDirection_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackColorTestFlowDirection_VerifyVisualState.png
new file mode 100644
index 000000000000..e9e13550d1c0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinTrackColorTestFlowDirection_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinimumAndChangeFlowDirection_RTL.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinimumAndChangeFlowDirection_RTL.png
new file mode 100644
index 000000000000..ea800d601312
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetMinimumAndChangeFlowDirection_RTL.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbAndBackgroundColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbAndBackgroundColor_VerifyVisualState.png
new file mode 100644
index 000000000000..f0f1076dd4d2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbAndBackgroundColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbAndMaxTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbAndMaxTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..ae5f801438ef
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbAndMaxTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbAndMinTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbAndMinTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..abd20e006f5b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbAndMinTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbColorAndThumbImageSource_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbColorAndThumbImageSource_VerifyVisualState.png
new file mode 100644
index 000000000000..7e970ed84c6b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbColorAndThumbImageSource_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbImageSourceAndThumbColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbImageSourceAndThumbColor_VerifyVisualState.png
new file mode 100644
index 000000000000..9e8f11dafaea
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetThumbImageSourceAndThumbColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetValueAndFlowDirection_RTL_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetValueAndFlowDirection_RTL_VerifyVisualState.png
new file mode 100644
index 000000000000..62c2451cd870
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetValueAndFlowDirection_RTL_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetValueAndMaxTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetValueAndMaxTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..dd7d87de4b7c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetValueAndMaxTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetValueAndMinTrackColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetValueAndMinTrackColor_VerifyVisualState.png
new file mode 100644
index 000000000000..f4d5bd743833
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetValueAndMinTrackColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetValueAndThumbImageSource_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetValueAndThumbImageSource_VerifyVisualState.png
new file mode 100644
index 000000000000..3e3bfa18a527
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetValueAndThumbImageSource_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetVisibilityToFalse_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetVisibilityToFalse_VerifyVisualState.png
new file mode 100644
index 000000000000..2d4d53f54ed0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Slider_SetVisibilityToFalse_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SpanLineHeightShouldNotGrowProgressively.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SpanLineHeightShouldNotGrowProgressively.png
new file mode 100644
index 000000000000..7f26ab43e8be
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SpanLineHeightShouldNotGrowProgressively.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/StatusBarAndNavigationBarShouldInheritColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/StatusBarAndNavigationBarShouldInheritColor.png
new file mode 100644
index 000000000000..60d83d489649
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/StatusBarAndNavigationBarShouldInheritColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Stepper_ChangeFlowDirection_RTL_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Stepper_ChangeFlowDirection_RTL_VerifyVisualState.png
new file mode 100644
index 000000000000..e3f266ed2e15
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Stepper_ChangeFlowDirection_RTL_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwipeViewShouldNotClose.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwipeViewShouldNotClose.png
new file mode 100644
index 000000000000..638fd33ff2a5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwipeViewShouldNotClose.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwitchColorTestAfterToggling.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwitchColorTestAfterToggling.png
new file mode 100644
index 000000000000..5bb594fda939
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwitchColorTestAfterToggling.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwitchColorTestBeforeToggling.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwitchColorTestBeforeToggling.png
new file mode 100644
index 000000000000..18178207a1cd
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwitchColorTestBeforeToggling.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwitchOnOffVisualStatesTest_SwitchOff.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwitchOnOffVisualStatesTest_SwitchOff.png
new file mode 100644
index 000000000000..647a979e6ca9
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwitchOnOffVisualStatesTest_SwitchOff.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwitchTrackColorTest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwitchTrackColorTest.png
new file mode 100644
index 000000000000..1957064072ad
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SwitchTrackColorTest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_Click_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_Click_VerifyVisualState.png
new file mode 100644
index 000000000000..fecff2e01b2a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_Click_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_InitialState_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_InitialState_VerifyVisualState.png
new file mode 100644
index 000000000000..1147c5e30311
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_InitialState_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_SetFlowDirectionAndToggled_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_SetFlowDirectionAndToggled_VerifyVisualState.png
new file mode 100644
index 000000000000..1a0b6e40ac43
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_SetFlowDirectionAndToggled_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_SetOnColorAndThumbColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_SetOnColorAndThumbColor_VerifyVisualState.png
new file mode 100644
index 000000000000..f39100e52fc5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_SetOnColorAndThumbColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_SetThumbColorAndOnColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_SetThumbColorAndOnColor_VerifyVisualState.png
new file mode 100644
index 000000000000..3a55f193d24c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_SetThumbColorAndOnColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_SetToggledAndOnColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_SetToggledAndOnColor_VerifyVisualState.png
new file mode 100644
index 000000000000..8c47f933e4a7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Switch_SetToggledAndOnColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SystemFontsShouldRenderCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SystemFontsShouldRenderCorrectly.png
new file mode 100644
index 000000000000..f9ee31492a20
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/SystemFontsShouldRenderCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TabBarIconsShouldAutoscaleShell.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TabBarIconsShouldAutoscaleShell.png
new file mode 100644
index 000000000000..7ef0d8615fd4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TabBarIconsShouldAutoscaleShell.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TabBarIconsShouldAutoscaleTabbedPage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TabBarIconsShouldAutoscaleTabbedPage.png
new file mode 100644
index 000000000000..7f52fae68d54
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TabBarIconsShouldAutoscaleTabbedPage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TabbedPageBackButtonUpdated.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TabbedPageBackButtonUpdated.png
new file mode 100644
index 000000000000..caecdc062e85
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TabbedPageBackButtonUpdated.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TabbedPageUnselectedBarTextColorConsistency.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TabbedPageUnselectedBarTextColorConsistency.png
new file mode 100644
index 000000000000..cf09b73717d8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TabbedPageUnselectedBarTextColorConsistency.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TestDynamicItemTemplateChangeInCarouselView.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TestDynamicItemTemplateChangeInCarouselView.png
new file mode 100644
index 000000000000..095a88746bc2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TestDynamicItemTemplateChangeInCarouselView.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TextInEditorShouldScroll.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TextInEditorShouldScroll.png
new file mode 100644
index 000000000000..3909bcfc7d2e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TextInEditorShouldScroll.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TextsInEditorsBeforeScaling.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TextsInEditorsBeforeScaling.png
new file mode 100644
index 000000000000..3781b2f9f7da
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TextsInEditorsBeforeScaling.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_InitialState_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_InitialState_VerifyVisualState.png
new file mode 100644
index 000000000000..7fce85d0ac3c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_InitialState_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_ModifyOldTimeAndNewTime_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_ModifyOldTimeAndNewTime_VerifyVisualState.png
new file mode 100644
index 000000000000..1adc7c5f8da7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_ModifyOldTimeAndNewTime_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_OldTimeAndNewTime_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_OldTimeAndNewTime_VerifyVisualState.png
new file mode 100644
index 000000000000..c221c207e95a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_OldTimeAndNewTime_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetCulture_arEG_VerifyTimeFormat.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetCulture_arEG_VerifyTimeFormat.png
new file mode 100644
index 000000000000..f74fadec8b5e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetCulture_arEG_VerifyTimeFormat.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetCulture_jaJP_VerifyTimeFormat.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetCulture_jaJP_VerifyTimeFormat.png
new file mode 100644
index 000000000000..ab16b14a121d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetCulture_jaJP_VerifyTimeFormat.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontAttributesAndFontFamily_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontAttributesAndFontFamily_VerifyVisualState.png
new file mode 100644
index 000000000000..f759b8a9ae0c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontAttributesAndFontFamily_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontAttributesAndFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontAttributesAndFontSize_VerifyVisualState.png
new file mode 100644
index 000000000000..22f00267e386
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontAttributesAndFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontAttributesAndFormat_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontAttributesAndFormat_VerifyVisualState.png
new file mode 100644
index 000000000000..3ef877d7f5b6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontAttributesAndFormat_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontFamilyAndFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontFamilyAndFontSize_VerifyVisualState.png
new file mode 100644
index 000000000000..761b7a60feb2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontFamilyAndFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontFamilyAndFormat_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontFamilyAndFormat_VerifyVisualState.png
new file mode 100644
index 000000000000..d5a846bd71cc
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontFamilyAndFormat_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontSizeAndFormat_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontSizeAndFormat_VerifyVisualState.png
new file mode 100644
index 000000000000..d800bef46832
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFontSizeAndFormat_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormatTAndTime_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormatTAndTime_VerifyVisualState.png
new file mode 100644
index 000000000000..9cf2bf416e07
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormatTAndTime_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormat_T_WithFontAttributes_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormat_T_WithFontAttributes_VerifyVisualState.png
new file mode 100644
index 000000000000..348b509d2a6f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormat_T_WithFontAttributes_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormat_T_WithFontFamily_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormat_T_WithFontFamily_VerifyVisualState.png
new file mode 100644
index 000000000000..489319adb629
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormat_T_WithFontFamily_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormat_T_WithFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormat_T_WithFontSize_VerifyVisualState.png
new file mode 100644
index 000000000000..44631ea7c151
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormat_T_WithFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormat_t_AndTime_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormat_t_AndTime_VerifyVisualState.png
new file mode 100644
index 000000000000..b72515447f38
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetFormat_t_AndTime_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetShadow_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetShadow_VerifyVisualState.png
new file mode 100644
index 000000000000..b92ffd54de00
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetShadow_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetTimeAndCharacterSpacing_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetTimeAndCharacterSpacing_VerifyVisualState.png
new file mode 100644
index 000000000000..ecb783ce4f67
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetTimeAndCharacterSpacing_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetTimeAndIsEnabled_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetTimeAndIsEnabled_VerifyVisualState.png
new file mode 100644
index 000000000000..26b92445ca97
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetTimeAndIsEnabled_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetTimeAndTextColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetTimeAndTextColor_VerifyVisualState.png
new file mode 100644
index 000000000000..95aa638520c0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TimePicker_SetTimeAndTextColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TitleViewShouldBeVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TitleViewShouldBeVisible.png
new file mode 100644
index 000000000000..776e93e9da15
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/TitleViewShouldBeVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolBarSecondayItemsShouldNotUseBarTextColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolBarSecondayItemsShouldNotUseBarTextColor.png
new file mode 100644
index 000000000000..eaa1ef2ea750
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolBarSecondayItemsShouldNotUseBarTextColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemCorrectSizeTest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemCorrectSizeTest.png
new file mode 100644
index 000000000000..e80e9c49f399
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemCorrectSizeTest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemFontColorDynamicUpdate.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemFontColorDynamicUpdate.png
new file mode 100644
index 000000000000..9354fbef48bc
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemFontColorDynamicUpdate.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemFontIconSourceChangesAtRunTime.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemFontIconSourceChangesAtRunTime.png
new file mode 100644
index 000000000000..1d54497056a3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemFontIconSourceChangesAtRunTime.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemShouldBeCorrectlyRendered.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemShouldBeCorrectlyRendered.png
new file mode 100644
index 000000000000..f596392a2ad0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemShouldBeCorrectlyRendered.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemsShouldBeVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemsShouldBeVisible.png
new file mode 100644
index 000000000000..440ddf2f31b0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemsShouldBeVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemsShouldWork.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemsShouldWork.png
new file mode 100644
index 000000000000..6a957f12317a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarItemsShouldWork.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarTextColorOnInteraction.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarTextColorOnInteraction.png
new file mode 100644
index 000000000000..14cebec0b359
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ToolbarTextColorOnInteraction.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Top_SwipeItems.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Top_SwipeItems.png
new file mode 100644
index 000000000000..f4549245fd62
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Top_SwipeItems.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/UpdateSearchHandlerMenuItemForTabNavigation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/UpdateSearchHandlerMenuItemForTabNavigation.png
new file mode 100644
index 000000000000..e89508582267
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/UpdateSearchHandlerMenuItemForTabNavigation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/UpdateToolbarItemAfterNavigate.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/UpdateToolbarItemAfterNavigate.png
new file mode 100644
index 000000000000..1ec54ae282a2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/UpdateToolbarItemAfterNavigate.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/UpdatedIsEnabledProperty.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/UpdatedIsEnabledProperty.png
new file mode 100644
index 000000000000..f8ccc20af3dd
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/UpdatedIsEnabledProperty.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/UpdatedSelectionIndicatorProperly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/UpdatedSelectionIndicatorProperly.png
new file mode 100644
index 000000000000..eb7abb0bdcd5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/UpdatedSelectionIndicatorProperly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ValidateEntryClearButtonVisibilityBehavior.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ValidateEntryClearButtonVisibilityBehavior.png
new file mode 100644
index 000000000000..363b84766374
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ValidateEntryClearButtonVisibilityBehavior.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ValidateFrameOffsets.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ValidateFrameOffsets.png
new file mode 100644
index 000000000000..9f741d762fa1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ValidateFrameOffsets.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ValidateRadioButtonNoBorderColorWhenNoBorderWidth.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ValidateRadioButtonNoBorderColorWhenNoBorderWidth.png
new file mode 100644
index 000000000000..ec64214ebeb0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ValidateRadioButtonNoBorderColorWhenNoBorderWidth.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ValidateTableViewTitles.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ValidateTableViewTitles.png
new file mode 100644
index 000000000000..43e37d982b45
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ValidateTableViewTitles.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyBorderWithStrokeDashArray.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyBorderWithStrokeDashArray.png
new file mode 100644
index 000000000000..abde6f412347
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyBorderWithStrokeDashArray.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage1_NoBorder.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage1_NoBorder.png
new file mode 100644
index 000000000000..513db7d07abd
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage1_NoBorder.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage2.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage2.png
new file mode 100644
index 000000000000..2b4ad3fb7afc
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage2.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage3.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage3.png
new file mode 100644
index 000000000000..b88da6743f35
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage3.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage4.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage4.png
new file mode 100644
index 000000000000..489ef203123d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage4.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage5.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage5.png
new file mode 100644
index 000000000000..6bda7a0982ad
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage5.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage6.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage6.png
new file mode 100644
index 000000000000..dd35a6047999
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage6.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage7.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage7.png
new file mode 100644
index 000000000000..4db5e1840051
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage7.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage8_Start.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage8_Start.png
new file mode 100644
index 000000000000..f698438946ea
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonPage8_Start.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonText.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonText.png
new file mode 100644
index 000000000000..55415b589cc1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyButtonText.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCarouselLayoutOrientationChange.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCarouselLayoutOrientationChange.png
new file mode 100644
index 000000000000..bc391b728716
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCarouselLayoutOrientationChange.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCarouselViewItemsSourceClearedDynamically.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCarouselViewItemsSourceClearedDynamically.png
new file mode 100644
index 000000000000..06c684942ba4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCarouselViewItemsSourceClearedDynamically.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCharacterSpacingWhenFontFamily.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCharacterSpacingWhenFontFamily.png
new file mode 100644
index 000000000000..fc0ac7bc444b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCharacterSpacingWhenFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCharacterSpacingWhenMaxLengthSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCharacterSpacingWhenMaxLengthSet.png
new file mode 100644
index 000000000000..7d1adee6b43d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCharacterSpacingWhenMaxLengthSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCheckBoxCheckedState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCheckBoxCheckedState.png
new file mode 100644
index 000000000000..c3978a3e34a0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCheckBoxCheckedState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCheckBoxUnCheckedState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCheckBoxUnCheckedState.png
new file mode 100644
index 000000000000..c1920e69f798
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCheckBoxUnCheckedState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png
new file mode 100644
index 000000000000..623f34ac7f0d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png
new file mode 100644
index 000000000000..a2a9e85c20b4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyClearButtonVisiblityWhenTextAlignedVertically.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyClearButtonVisiblityWhenTextAlignedVertically.png
new file mode 100644
index 000000000000..e9c1f89b7405
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyClearButtonVisiblityWhenTextAlignedVertically.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyClearVisiblityButtonWhenTextColorChanged.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyClearVisiblityButtonWhenTextColorChanged.png
new file mode 100644
index 000000000000..accaa54a78ee
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyClearVisiblityButtonWhenTextColorChanged.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCollectionViewItemsAfterScrolling.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCollectionViewItemsAfterScrolling.png
new file mode 100644
index 000000000000..e9e712bc64b2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCollectionViewItemsAfterScrolling.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCollectionViewVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCollectionViewVisualState.png
new file mode 100644
index 000000000000..bf345b6c5953
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyCollectionViewVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyContextActionCell.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyContextActionCell.png
new file mode 100644
index 000000000000..cd3375d4e113
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyContextActionCell.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyDatePickerDotBasedDateFormat.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyDatePickerDotBasedDateFormat.png
new file mode 100644
index 000000000000..dc294b0cdd4f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyDatePickerDotBasedDateFormat.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyDynamicEditorScaling.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyDynamicEditorScaling.png
new file mode 100644
index 000000000000..4f4de5785a3b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyDynamicEditorScaling.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorCharacterSpacingWhenFontFamily.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorCharacterSpacingWhenFontFamily.png
new file mode 100644
index 000000000000..18b8e3c4e665
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorCharacterSpacingWhenFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorCharacterSpacingWhenMaxLengthSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorCharacterSpacingWhenMaxLengthSet.png
new file mode 100644
index 000000000000..5aeb54fd0529
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorCharacterSpacingWhenMaxLengthSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorCharacterSpacingWithText.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorCharacterSpacingWithText.png
new file mode 100644
index 000000000000..f5a9f66ad8b8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorCharacterSpacingWithText.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorControlWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorControlWhenFlowDirectionSet.png
new file mode 100644
index 000000000000..25b2f16eac95
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorControlWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorControlWhenPlaceholderColorSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorControlWhenPlaceholderColorSet.png
new file mode 100644
index 000000000000..7433b2ba1f19
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorControlWhenPlaceholderColorSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorControlWhenPlaceholderTextSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorControlWhenPlaceholderTextSet.png
new file mode 100644
index 000000000000..12e665ef2f01
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorControlWhenPlaceholderTextSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorHorizontalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorHorizontalTextAlignmentBasedOnCharacterSpacing.png
new file mode 100644
index 000000000000..bb6182ed9a46
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorHorizontalTextAlignmentBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png
new file mode 100644
index 000000000000..d93304f0c9be
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWhenFlowDirectionSet.png
new file mode 100644
index 000000000000..0f9c4343d488
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithCharacterSpacing.png
new file mode 100644
index 000000000000..1e9cc75fdba2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithFontAttributes.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithFontAttributes.png
new file mode 100644
index 000000000000..45144c5f55aa
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithFontAttributes.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithFontFamily.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithFontFamily.png
new file mode 100644
index 000000000000..c35fe3b3a8cb
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithFontSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithFontSize.png
new file mode 100644
index 000000000000..219bf8098cff
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithHorizontalAlignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithHorizontalAlignment.png
new file mode 100644
index 000000000000..53c0bc91b0f5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithHorizontalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithShadow.png
new file mode 100644
index 000000000000..957cd53677a2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithVerticalAlignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithVerticalAlignment.png
new file mode 100644
index 000000000000..9a9d6bc89f0a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorPlaceholderWithVerticalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenAlingnedHorizontally.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenAlingnedHorizontally.png
new file mode 100644
index 000000000000..45d60ba88b34
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenAlingnedHorizontally.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenAlingnedVertically.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenAlingnedVertically.png
new file mode 100644
index 000000000000..82596e166de5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenAlingnedVertically.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenCharacterSpacingSetValues.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenCharacterSpacingSetValues.png
new file mode 100644
index 000000000000..28f6793cbbca
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenCharacterSpacingSetValues.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenFontAttributesSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenFontAttributesSet.png
new file mode 100644
index 000000000000..c2ddcde316b5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenFontAttributesSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenFontFamilySetValue.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenFontFamilySetValue.png
new file mode 100644
index 000000000000..b29c2dcaa9e4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenFontFamilySetValue.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenFontSizeSetCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenFontSizeSetCorrectly.png
new file mode 100644
index 000000000000..ad27173faf75
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenFontSizeSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenTextColorSetCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenTextColorSetCorrectly.png
new file mode 100644
index 000000000000..bd73cf0bdc9e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorTextWhenTextColorSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorVerticalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorVerticalTextAlignmentBasedOnCharacterSpacing.png
new file mode 100644
index 000000000000..873061b8c4bc
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditorVerticalTextAlignmentBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditor_WithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditor_WithShadow.png
new file mode 100644
index 000000000000..0b5eb32fdec1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEditor_WithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryClearButtonVisibility.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryClearButtonVisibility.png
new file mode 100644
index 000000000000..a6ebe7ce3426
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryClearButtonVisibility.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryClearButtonVisibilitySetToNever.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryClearButtonVisibilitySetToNever.png
new file mode 100644
index 000000000000..b2e9e2129772
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryClearButtonVisibilitySetToNever.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryClearButtonVisibilitySetToWhileEditing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryClearButtonVisibilitySetToWhileEditing.png
new file mode 100644
index 000000000000..4f8fd4af4f99
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryClearButtonVisibilitySetToWhileEditing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryControlWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryControlWhenFlowDirectionSet.png
new file mode 100644
index 000000000000..9e994f328be7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryControlWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryControlWhenPlaceholderColorSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryControlWhenPlaceholderColorSet.png
new file mode 100644
index 000000000000..5ef9113b8bc6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryControlWhenPlaceholderColorSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryControlWhenPlaceholderTextSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryControlWhenPlaceholderTextSet.png
new file mode 100644
index 000000000000..bec637b0473c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryControlWhenPlaceholderTextSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryHorizontalEndTextAlignmentPosition.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryHorizontalEndTextAlignmentPosition.png
new file mode 100644
index 000000000000..b904f580f228
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntryHorizontalEndTextAlignmentPosition.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntry_WithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntry_WithShadow.png
new file mode 100644
index 000000000000..f0a1577d91d2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyEntry_WithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyFlyoutBackgroundColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyFlyoutBackgroundColor.png
new file mode 100644
index 000000000000..25dac699b83f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyFlyoutBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyFontImageWithFontColorGreen.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyFontImageWithFontColorGreen.png
new file mode 100644
index 000000000000..87b072a10eb3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyFontImageWithFontColorGreen.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyFontImageWithFontSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyFontImageWithFontSize.png
new file mode 100644
index 000000000000..b04771cc998b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyFontImageWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyGraphicsViewWithoutGrayLine.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyGraphicsViewWithoutGrayLine.png
new file mode 100644
index 000000000000..88102b12c0c5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyGraphicsViewWithoutGrayLine.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyGreyShades.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyGreyShades.png
new file mode 100644
index 000000000000..b1f0e992061e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyGreyShades.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHamburgerIcon.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHamburgerIcon.png
new file mode 100644
index 000000000000..7f101006b33b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHamburgerIcon.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png
new file mode 100644
index 000000000000..41106862673e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png
new file mode 100644
index 000000000000..6779b74ad48a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHybridWebViewWithFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHybridWebViewWithFlowDirection.png
new file mode 100644
index 000000000000..f8fe72402eee
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHybridWebViewWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHybridWebViewWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHybridWebViewWithShadow.png
new file mode 100644
index 000000000000..e3a0423435e8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyHybridWebViewWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFillWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFillWithImageSourceFromFile.png
new file mode 100644
index 000000000000..88238ac2cba3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFillWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png
new file mode 100644
index 000000000000..cc6af638e45e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFillWithImageSourceFromUri.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFillWithImageSourceFromUri.png
new file mode 100644
index 000000000000..360cbfe2cd29
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFillWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFitWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFitWithImageSourceFromFile.png
new file mode 100644
index 000000000000..6e4f02d21718
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFitWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png
new file mode 100644
index 000000000000..611b5dae63a2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFitWithImageSourceFromUri.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFitWithImageSourceFromUri.png
new file mode 100644
index 000000000000..482bcc545e94
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_AspectFitWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_CenterWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_CenterWithImageSourceFromFile.png
new file mode 100644
index 000000000000..ed359ad2ebb5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_CenterWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_CenterWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_CenterWithImageSourceFromFontImage.png
new file mode 100644
index 000000000000..8a46a72e2c16
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_CenterWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_CenterWithImageSourceFromUri.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_CenterWithImageSourceFromUri.png
new file mode 100644
index 000000000000..eaf4a079b884
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_CenterWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_FillWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_FillWithImageSourceFromFile.png
new file mode 100644
index 000000000000..755f97448f78
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_FillWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_FillWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_FillWithImageSourceFromFontImage.png
new file mode 100644
index 000000000000..9b31b222dd03
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_FillWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_FillWithImageSourceFromUri.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_FillWithImageSourceFromUri.png
new file mode 100644
index 000000000000..fd69a98a016a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspect_FillWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspects.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspects.png
new file mode 100644
index 000000000000..54b6dc8f0b7b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageAspects.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_AspectFillWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_AspectFillWithImageSourceFromFontImage.png
new file mode 100644
index 000000000000..cf79f8f05739
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_AspectFillWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_AspectFitWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_AspectFitWithImageSourceFromFile.png
new file mode 100644
index 000000000000..b98a68ee8acd
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_AspectFitWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_AspectFitWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_AspectFitWithImageSourceFromFontImage.png
new file mode 100644
index 000000000000..c0bb760eb4fb
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_AspectFitWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_AspectFitWithImageSourceFromUri.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_AspectFitWithImageSourceFromUri.png
new file mode 100644
index 000000000000..b71488728787
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_AspectFitWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_CenterWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_CenterWithImageSourceFromFile.png
new file mode 100644
index 000000000000..6a6d55924635
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_CenterWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_CenterWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_CenterWithImageSourceFromFontImage.png
new file mode 100644
index 000000000000..05a31e46a3bf
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_CenterWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_FillWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_FillWithImageSourceFromFile.png
new file mode 100644
index 000000000000..748117ee98f7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_FillWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_FillWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_FillWithImageSourceFromFontImage.png
new file mode 100644
index 000000000000..a8f1ca7b97d0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_FillWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_FillWithImageSourceFromUri.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_FillWithImageSourceFromUri.png
new file mode 100644
index 000000000000..184d09357716
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonAspect_FillWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonFlowDirectionRTL.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonFlowDirectionRTL.png
new file mode 100644
index 000000000000..53a85a063f7a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonFlowDirectionRTL.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithBorderColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithBorderColor.png
new file mode 100644
index 000000000000..61c49ace476f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithBorderColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithBorderColorAndWidth.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithBorderColorAndWidth.png
new file mode 100644
index 000000000000..46ca98805db4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithBorderColorAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithBorderWidth.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithBorderWidth.png
new file mode 100644
index 000000000000..cc3d030f4f31
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithBorderWidth.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithBorderWidthAndCornerRadius.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithBorderWidthAndCornerRadius.png
new file mode 100644
index 000000000000..81d4d546451c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithBorderWidthAndCornerRadius.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithCornerRadius.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithCornerRadius.png
new file mode 100644
index 000000000000..d32d7495c7e5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithCornerRadius.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithPadding.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithPadding.png
new file mode 100644
index 000000000000..c324ebb2fe22
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithPadding.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithShadow.png
new file mode 100644
index 000000000000..ae80b7544cb3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageButtonWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageFlowDirectionRTL.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageFlowDirectionRTL.png
new file mode 100644
index 000000000000..f6fef0578410
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageFlowDirectionRTL.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageWithShadow.png
new file mode 100644
index 000000000000..0d446f8fe690
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyImageWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyInitialEntryReturnTypeChange.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyInitialEntryReturnTypeChange.png
new file mode 100644
index 000000000000..e85fda0c33c2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyInitialEntryReturnTypeChange.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyInitialToolbarButtonHidden.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyInitialToolbarButtonHidden.png
new file mode 100644
index 000000000000..2e905927c070
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyInitialToolbarButtonHidden.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordBasedOnCharacterSpacing.png
new file mode 100644
index 000000000000..7146d7fe401f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordBasedOnHorizontalTextAlignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordBasedOnHorizontalTextAlignment.png
new file mode 100644
index 000000000000..7970e59701ad
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordBasedOnHorizontalTextAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordBasedOnVerticalTextAlignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordBasedOnVerticalTextAlignment.png
new file mode 100644
index 000000000000..6a853da5808c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordBasedOnVerticalTextAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordWhenFontSizeSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordWhenFontSizeSet.png
new file mode 100644
index 000000000000..0dea405e0a84
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordWhenFontSizeSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordWhenMaxLenghtSetValue.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordWhenMaxLenghtSetValue.png
new file mode 100644
index 000000000000..706ab7cf21ba
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyIsPasswordWhenMaxLenghtSetValue.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelTextColorWhenResettingFromFormattedText.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelTextColorWhenResettingFromFormattedText.png
new file mode 100644
index 000000000000..f62ade84f3db
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelTextColorWhenResettingFromFormattedText.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWhenFormattedTextWithHorizontalAndVerticalAlignmentStart.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWhenFormattedTextWithHorizontalAndVerticalAlignmentStart.png
new file mode 100644
index 000000000000..e3521ec448ef
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWhenFormattedTextWithHorizontalAndVerticalAlignmentStart.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWhenFormattedTextWithPadding.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWhenFormattedTextWithPadding.png
new file mode 100644
index 000000000000..2c505b15e961
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWhenFormattedTextWithPadding.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndFontFamily.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndFontFamily.png
new file mode 100644
index 000000000000..c7189017191b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndFontSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndFontSize.png
new file mode 100644
index 000000000000..e6f6b12f4006
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndTextColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndTextColor.png
new file mode 100644
index 000000000000..3ffd54f6a7f7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndTextColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndTextDecorations.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndTextDecorations.png
new file mode 100644
index 000000000000..9ce65e03c62c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndTextDecorations.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndTextTransform.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndTextTransform.png
new file mode 100644
index 000000000000..baaec1c2ef00
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndTextTransform.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndTextType.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndTextType.png
new file mode 100644
index 000000000000..95c147aa3d3b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontAttributesAndTextType.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndFontColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndFontColor.png
new file mode 100644
index 000000000000..252c51c86ae7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndFontColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndFontSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndFontSize.png
new file mode 100644
index 000000000000..9eb06a3a4edf
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndTextDecorations.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndTextDecorations.png
new file mode 100644
index 000000000000..eb7f64ed26f1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndTextDecorations.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndTextTransform.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndTextTransform.png
new file mode 100644
index 000000000000..1c552b334e71
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndTextTransform.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndTextType.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndTextType.png
new file mode 100644
index 000000000000..766fbeb74352
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFontFamilyAndTextType.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedText.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedText.png
new file mode 100644
index 000000000000..5019f784f4e2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedText.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextAndLineBreakModeNoWrap.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextAndLineBreakModeNoWrap.png
new file mode 100644
index 000000000000..bb9661d00b60
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextAndLineBreakModeNoWrap.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextAndTextTransformLower.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextAndTextTransformLower.png
new file mode 100644
index 000000000000..3674064a2961
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextAndTextTransformLower.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenFontSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenFontSize.png
new file mode 100644
index 000000000000..0479d320b952
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenHorizontalAndVerticalAlignmentCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenHorizontalAndVerticalAlignmentCenter.png
new file mode 100644
index 000000000000..30697a290fde
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenHorizontalAndVerticalAlignmentCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenHorizontalAndVerticalAlignmentEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenHorizontalAndVerticalAlignmentEnd.png
new file mode 100644
index 000000000000..ae8cfc95060a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenHorizontalAndVerticalAlignmentEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenLineBreakModeHeadTruncation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenLineBreakModeHeadTruncation.png
new file mode 100644
index 000000000000..fb8d4a0c6bbe
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenLineBreakModeHeadTruncation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenLineBreakModeMiddleTruncation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenLineBreakModeMiddleTruncation.png
new file mode 100644
index 000000000000..f64e7bab3636
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenLineBreakModeMiddleTruncation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png
new file mode 100644
index 000000000000..0a6eac43c14b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenLineBreakModeWordWrap.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenLineBreakModeWordWrap.png
new file mode 100644
index 000000000000..2b9164f16c15
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenLineBreakModeWordWrap.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenMaxLines.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenMaxLines.png
new file mode 100644
index 000000000000..cc9a8e1cff7f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenMaxLines.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenTextColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenTextColor.png
new file mode 100644
index 000000000000..bdd48cb67c07
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenTextColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenTextTransformUpper.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenTextTransformUpper.png
new file mode 100644
index 000000000000..f28db537155e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithFormattedTextWhenTextTransformUpper.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndCharacterSpacing.png
new file mode 100644
index 000000000000..8fdaec68c298
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndFontAttributes.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndFontAttributes.png
new file mode 100644
index 000000000000..5e77350ca8c6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndFontAttributes.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndFontColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndFontColor.png
new file mode 100644
index 000000000000..1d2eebc6537b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndFontColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndFontFamily.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndFontFamily.png
new file mode 100644
index 000000000000..e2ce9ec3e57d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndFontSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndFontSize.png
new file mode 100644
index 000000000000..43383af7bf56
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndLineBreakModeHeadTruncation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndLineBreakModeHeadTruncation.png
new file mode 100644
index 000000000000..36c9cd161399
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndLineBreakModeHeadTruncation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndLineBreakModeMiddleTruncation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndLineBreakModeMiddleTruncation.png
new file mode 100644
index 000000000000..8121d34e1d85
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndLineBreakModeMiddleTruncation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndLineBreakModeNoWrap.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndLineBreakModeNoWrap.png
new file mode 100644
index 000000000000..0cc9594f5063
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndLineBreakModeNoWrap.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndLineBreakModeTailTruncation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndLineBreakModeTailTruncation.png
new file mode 100644
index 000000000000..7dfe274c575f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndLineBreakModeTailTruncation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndMaxlines.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndMaxlines.png
new file mode 100644
index 000000000000..8fa63c5a7b2d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndMaxlines.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndTextDecorations.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndTextDecorations.png
new file mode 100644
index 000000000000..49b6f6d8c9fa
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndTextDecorations.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndTextTransform.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndTextTransform.png
new file mode 100644
index 000000000000..944c0d54beb1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndTextTransform.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndTextType.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndTextType.png
new file mode 100644
index 000000000000..abc2b37dad14
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextAndTextType.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextDecorationsAndTextTransform.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextDecorationsAndTextTransform.png
new file mode 100644
index 000000000000..0a5268e88afc
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextDecorationsAndTextTransform.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextTypeAndFontSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextTypeAndFontSize.png
new file mode 100644
index 000000000000..38155e1ba413
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextTypeAndFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextTypeAndLineBreakModeNoWrap.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextTypeAndLineBreakModeNoWrap.png
new file mode 100644
index 000000000000..7654df64e2fc
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextTypeAndLineBreakModeNoWrap.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextTypeAndLineBreakModeWordWrap.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextTypeAndLineBreakModeWordWrap.png
new file mode 100644
index 000000000000..8156a512975a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextTypeAndLineBreakModeWordWrap.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextTypeAndTextColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextTypeAndTextColor.png
new file mode 100644
index 000000000000..17c59adb30b7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextTypeAndTextColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenLineHeight.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenLineHeight.png
new file mode 100644
index 000000000000..e6e7d307ed90
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenLineHeight.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenPaddingApplied.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenPaddingApplied.png
new file mode 100644
index 000000000000..41724680d769
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenPaddingApplied.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentCenter.png
new file mode 100644
index 000000000000..cbc9c0bd7d7c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentEnd.png
new file mode 100644
index 000000000000..20225c6ef3a2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentStart.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentStart.png
new file mode 100644
index 000000000000..18f1979dabb6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentStart.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithGroupedList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithGroupedList.png
new file mode 100644
index 000000000000..47b9cbd04ab7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithGroupedList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithGroupedListWhenHorizontalGrid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithGroupedListWhenHorizontalGrid.png
new file mode 100644
index 000000000000..ccd3008e5cf6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithGroupedListWhenHorizontalGrid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithGroupedListWhenHorizontalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithGroupedListWhenHorizontalList.png
new file mode 100644
index 000000000000..1b2abaf3e051
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithGroupedListWhenHorizontalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithGroupedListWhenVerticalGrid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithGroupedListWhenVerticalGrid.png
new file mode 100644
index 000000000000..0cb900c08123
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithGroupedListWhenVerticalGrid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithObservableCollection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithObservableCollection.png
new file mode 100644
index 000000000000..936b81605818
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithObservableCollection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithObservableCollectionWhenHorizontalGrid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithObservableCollectionWhenHorizontalGrid.png
new file mode 100644
index 000000000000..25ad8a8d4c01
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithObservableCollectionWhenHorizontalGrid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithObservableCollectionWhenHorizontalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithObservableCollectionWhenHorizontalList.png
new file mode 100644
index 000000000000..fdb351e797b9
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithObservableCollectionWhenHorizontalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithObservableCollectionWhenVerticalGrid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithObservableCollectionWhenVerticalGrid.png
new file mode 100644
index 000000000000..a7490482c45b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureAllItemsWithObservableCollectionWhenVerticalGrid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureFirstItemsWithGroupedList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureFirstItemsWithGroupedList.png
new file mode 100644
index 000000000000..61917454b428
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureFirstItemsWithGroupedList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureFirstItemsWithObservableCollection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureFirstItemsWithObservableCollection.png
new file mode 100644
index 000000000000..a4e2ee5a81cd
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureFirstItemsWithObservableCollection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureFirstItemsWithObservableCollectionWhenVerticalGrid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureFirstItemsWithObservableCollectionWhenVerticalGrid.png
new file mode 100644
index 000000000000..c576525d5223
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyMeasureFirstItemsWithObservableCollectionWhenVerticalGrid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyModelItemsGroupedListWhenMultipleModePreSelection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyModelItemsGroupedListWhenMultipleModePreSelection.png
new file mode 100644
index 000000000000..cba7763378d0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyModelItemsGroupedListWhenMultipleModePreSelection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyModelItemsGroupedListWhenSingleModePreSelection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyModelItemsGroupedListWhenSingleModePreSelection.png
new file mode 100644
index 000000000000..6db41e80e371
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyModelItemsGroupedListWhenSingleModePreSelection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyModelItemsObservableCollectionWhenMultipleModePreSelection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyModelItemsObservableCollectionWhenMultipleModePreSelection.png
new file mode 100644
index 000000000000..2688bdb16955
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyModelItemsObservableCollectionWhenMultipleModePreSelection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyModelItemsObservableCollectionWhenSingleModePreSelection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyModelItemsObservableCollectionWhenSingleModePreSelection.png
new file mode 100644
index 000000000000..66c7aa4b22ba
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyModelItemsObservableCollectionWhenSingleModePreSelection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyOpaqueModalDefault.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyOpaqueModalDefault.png
new file mode 100644
index 000000000000..935fdd6218b2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyOpaqueModalDefault.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWhenFlowDirectionSet.png
new file mode 100644
index 000000000000..708e14594994
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithCharacterSpacing.png
new file mode 100644
index 000000000000..6f9496ba7143
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithFontAttributes.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithFontAttributes.png
new file mode 100644
index 000000000000..91dfe9d8b791
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithFontAttributes.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithFontFamily.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithFontFamily.png
new file mode 100644
index 000000000000..7f8ddeef7b34
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithFontSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithFontSize.png
new file mode 100644
index 000000000000..6168cb4bfab2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithHorizontalAlignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithHorizontalAlignment.png
new file mode 100644
index 000000000000..fb78eee77414
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithHorizontalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithPasswordTrue.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithPasswordTrue.png
new file mode 100644
index 000000000000..3f921c2be222
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithPasswordTrue.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithShadow.png
new file mode 100644
index 000000000000..a718bafcf9a8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithVerticalAlignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithVerticalAlignment.png
new file mode 100644
index 000000000000..bc52c67b3600
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyPlaceholderWithVerticalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenter.png
new file mode 100644
index 000000000000..cedc4fec03a3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndAbsoluteLayoutContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndAbsoluteLayoutContent.png
new file mode 100644
index 000000000000..c1401dd57ad7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndAbsoluteLayoutContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndAbsoluteLayoutContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndAbsoluteLayoutContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..c06a33480e3f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndAbsoluteLayoutContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndEditorContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndEditorContent.png
new file mode 100644
index 000000000000..ae09ce4d23c0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndEditorContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndEditorContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndEditorContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..05dfd48ada1f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndEditorContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndGridContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndGridContent.png
new file mode 100644
index 000000000000..75c6f39e480e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndGridContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndGridContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndGridContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..f26c2ba510ab
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndGridContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndHorizontalLayoutContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndHorizontalLayoutContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..f382779661e6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndHorizontalLayoutContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndImageContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndImageContent.png
new file mode 100644
index 000000000000..161a9831be6d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndImageContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndImageContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndImageContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..07f9e8df3173
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndImageContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndOrientationHorizontal.png
new file mode 100644
index 000000000000..20e1043107b2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndVerticalLayoutContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndVerticalLayoutContent.png
new file mode 100644
index 000000000000..564aee37067b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionCenterAndVerticalLayoutContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEnd.png
new file mode 100644
index 000000000000..14dc0666543e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndAbsoluteLayoutContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndAbsoluteLayoutContent.png
new file mode 100644
index 000000000000..b7ec9d21840f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndAbsoluteLayoutContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndAbsoluteLayoutContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndAbsoluteLayoutContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..6f06c60d0b24
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndAbsoluteLayoutContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndEditorContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndEditorContent.png
new file mode 100644
index 000000000000..3aac8149c59c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndEditorContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndEditorContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndEditorContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..744eb2611932
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndEditorContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndGridContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndGridContent.png
new file mode 100644
index 000000000000..183495345a20
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndGridContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndGridContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndGridContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..899b1ba47c8d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndGridContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndHorizontalLayoutContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndHorizontalLayoutContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..ed24e0a4a8fd
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndHorizontalLayoutContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndImageContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndImageContent.png
new file mode 100644
index 000000000000..5710e3401cdb
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndImageContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndImageContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndImageContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..81820bc5252b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndImageContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndOrientationHorizontal.png
new file mode 100644
index 000000000000..02059f5a2b32
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndVerticalLayoutContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndVerticalLayoutContent.png
new file mode 100644
index 000000000000..189029efb014
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionEndAndVerticalLayoutContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisible.png
new file mode 100644
index 000000000000..2c70d66807d1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndAbsoluteContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndAbsoluteContent.png
new file mode 100644
index 000000000000..1160717fba19
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndAbsoluteContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndAbsoluteContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndAbsoluteContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..d06be9c5aca6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndAbsoluteContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndEditorContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndEditorContent.png
new file mode 100644
index 000000000000..0c6c8bcced26
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndEditorContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndEditorContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndEditorContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..c9ea1c120620
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndEditorContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndGridContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndGridContent.png
new file mode 100644
index 000000000000..b00af4241204
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndGridContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndGridContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndGridContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..173f32403528
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndGridContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndHorizontalLayoutContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndHorizontalLayoutContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..9baf4e227cff
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndHorizontalLayoutContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndImageContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndImageContent.png
new file mode 100644
index 000000000000..9e5ff7f6135c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndImageContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndImageContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndImageContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..2165c61c5ada
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndImageContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndOrientationHorizontal.png
new file mode 100644
index 000000000000..5fe439d17954
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndVerticalLayoutContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndVerticalLayoutContent.png
new file mode 100644
index 000000000000..eda409d8b8a9
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionMakeVisibleAndVerticalLayoutContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStart.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStart.png
new file mode 100644
index 000000000000..b44bb88ff6ef
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStart.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndAbsoluteLayoutContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndAbsoluteLayoutContent.png
new file mode 100644
index 000000000000..4ffdf21ab078
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndAbsoluteLayoutContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndAbsoluteLayoutContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndAbsoluteLayoutContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..e1c4770815e3
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndAbsoluteLayoutContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndEditorContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndEditorContent.png
new file mode 100644
index 000000000000..e38729d1d91c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndEditorContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndEditorContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndEditorContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..693671af8843
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndEditorContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndGridContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndGridContent.png
new file mode 100644
index 000000000000..95a0c142d33b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndGridContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndGridContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndGridContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..d47fd1c9ef31
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndGridContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndHorizontalLayoutContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndHorizontalLayoutContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..dfb7e8960a01
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndHorizontalLayoutContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndImageContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndImageContent.png
new file mode 100644
index 000000000000..228dfee640ee
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndImageContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndImageContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndImageContentWhenOrientationHorizontal.png
new file mode 100644
index 000000000000..d78b05daca1b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndImageContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndOrientationHorizontal.png
new file mode 100644
index 000000000000..804c5864d9c5
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndVerticalLayoutContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndVerticalLayoutContent.png
new file mode 100644
index 000000000000..b62a47dcca18
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyScrollViewWithScrollToPositionStartAndVerticalLayoutContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySearchBarPlaceholderAndBackgroundColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySearchBarPlaceholderAndBackgroundColor.png
new file mode 100644
index 000000000000..36aa0a798268
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySearchBarPlaceholderAndBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySearchHandlerClearPlaceholderIconColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySearchHandlerClearPlaceholderIconColor.png
new file mode 100644
index 000000000000..52924487b7b7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySearchHandlerClearPlaceholderIconColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySearchHandlerItemsAreVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySearchHandlerItemsAreVisible.png
new file mode 100644
index 000000000000..da8e88515b91
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySearchHandlerItemsAreVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySearchHandlerPlaceholderText.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySearchHandlerPlaceholderText.png
new file mode 100644
index 000000000000..98ca5e4bfc95
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySearchHandlerPlaceholderText.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectedItemClearsOnNullAssignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectedItemClearsOnNullAssignment.png
new file mode 100644
index 000000000000..e850b9719794
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectedItemClearsOnNullAssignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeMultipleWhenProgrammaticSelectionWhithItemsSourceGroupList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeMultipleWhenProgrammaticSelectionWhithItemsSourceGroupList.png
new file mode 100644
index 000000000000..88d484baf6ad
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeMultipleWhenProgrammaticSelectionWhithItemsSourceGroupList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithHorizontalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithHorizontalList.png
new file mode 100644
index 000000000000..3010fb47ea33
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithHorizontalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithVerticalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithVerticalList.png
new file mode 100644
index 000000000000..a34c7b1b4bfa
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithVerticalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeSingleWhenProgrammaticSelectionWhithItemsSourceGroupList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeSingleWhenProgrammaticSelectionWhithItemsSourceGroupList.png
new file mode 100644
index 000000000000..d9fc9a0c9b9d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeSingleWhenProgrammaticSelectionWhithItemsSourceGroupList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithHorizontalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithHorizontalList.png
new file mode 100644
index 000000000000..9818bad544db
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithHorizontalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithVerticalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithVerticalList.png
new file mode 100644
index 000000000000..971564e8f000
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithVerticalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyShellFlyoutBackgroundImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyShellFlyoutBackgroundImage.png
new file mode 100644
index 000000000000..552cd103d2a1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyShellFlyoutBackgroundImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySpacingAffectsItemSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySpacingAffectsItemSize.png
new file mode 100644
index 000000000000..59c652c1a5d0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySpacingAffectsItemSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyStringItemsGroupedListWhenMultipleModePreSelection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyStringItemsGroupedListWhenMultipleModePreSelection.png
new file mode 100644
index 000000000000..9696c22c85ca
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyStringItemsGroupedListWhenMultipleModePreSelection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyStringItemsObservableCollectionWhenMultipleModePreSelection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyStringItemsObservableCollectionWhenMultipleModePreSelection.png
new file mode 100644
index 000000000000..67917987e488
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyStringItemsObservableCollectionWhenMultipleModePreSelection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyStringItemsObservableCollectionWhenSingleModePreSelection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyStringItemsObservableCollectionWhenSingleModePreSelection.png
new file mode 100644
index 000000000000..2cc9d199f09d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyStringItemsObservableCollectionWhenSingleModePreSelection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwipeViewApperance.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwipeViewApperance.png
new file mode 100644
index 000000000000..e0993eb94163
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwipeViewApperance.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchDefaultColors.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchDefaultColors.png
new file mode 100644
index 000000000000..cd4b511d1fab
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchDefaultColors.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchNullColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchNullColor.png
new file mode 100644
index 000000000000..e93cd136b290
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchNullColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchOffColorAfterReopeningApp.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchOffColorAfterReopeningApp.png
new file mode 100644
index 000000000000..eb707de1ce19
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchOffColorAfterReopeningApp.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchOffColorAfterToggling.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchOffColorAfterToggling.png
new file mode 100644
index 000000000000..3ae116c130c2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchOffColorAfterToggling.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchOffColorAfterTogglingDarkTheme.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchOffColorAfterTogglingDarkTheme.png
new file mode 100644
index 000000000000..fc816a881f26
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifySwitchOffColorAfterTogglingDarkTheme.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTabBarIconIsLoaded.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTabBarIconIsLoaded.png
new file mode 100644
index 000000000000..08786fe123a0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTabBarIconIsLoaded.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTemplateViewMarginOnInitialDisplay.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTemplateViewMarginOnInitialDisplay.png
new file mode 100644
index 000000000000..7fdb63fdb26a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTemplateViewMarginOnInitialDisplay.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextDecorationAppliedProperly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextDecorationAppliedProperly.png
new file mode 100644
index 000000000000..4a20a24b36e4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextDecorationAppliedProperly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextIsNotMissing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextIsNotMissing.png
new file mode 100644
index 000000000000..f682d54dc227
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextIsNotMissing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenAlingnedHorizontally.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenAlingnedHorizontally.png
new file mode 100644
index 000000000000..a486e400db02
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenAlingnedHorizontally.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenAlingnedVertically.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenAlingnedVertically.png
new file mode 100644
index 000000000000..c18e7e12a7d1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenAlingnedVertically.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenCharacterSpacingSetValues.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenCharacterSpacingSetValues.png
new file mode 100644
index 000000000000..c08bf266f857
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenCharacterSpacingSetValues.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenClearButtonVisibleSetNever.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenClearButtonVisibleSetNever.png
new file mode 100644
index 000000000000..c77c361aeebf
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenClearButtonVisibleSetNever.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenFontAttributesSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenFontAttributesSet.png
new file mode 100644
index 000000000000..457379113990
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenFontAttributesSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenFontFamilySetValue.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenFontFamilySetValue.png
new file mode 100644
index 000000000000..6a217bfeff13
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenFontFamilySetValue.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenFontSizeSetCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenFontSizeSetCorrectly.png
new file mode 100644
index 000000000000..2bf5a23efdf2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenFontSizeSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenIsPasswordTrueOrFalse.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenIsPasswordTrueOrFalse.png
new file mode 100644
index 000000000000..93adeed03298
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenIsPasswordTrueOrFalse.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenKeyboardTypeSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenKeyboardTypeSet.png
new file mode 100644
index 000000000000..f383f0e0adea
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenKeyboardTypeSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenTextColorSetCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenTextColorSetCorrectly.png
new file mode 100644
index 000000000000..2781c2a335cd
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTextWhenTextColorSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTimePickerAppearance.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTimePickerAppearance.png
new file mode 100644
index 000000000000..2a38900fa45d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTimePickerAppearance.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyToolbarItemIconColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyToolbarItemIconColor.png
new file mode 100644
index 000000000000..ce7f3194b0b2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyToolbarItemIconColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTransparentModalShowsPageBeneathModal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTransparentModalShowsPageBeneathModal.png
new file mode 100644
index 000000000000..71dfa4dc9344
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyTransparentModalShowsPageBeneathModal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png
new file mode 100644
index 000000000000..3690e18c9563
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyWebViewBackgroundColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyWebViewBackgroundColor.png
new file mode 100644
index 000000000000..4e68e8071bd0
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyWebViewBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyWebViewDynamicBackgroundColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyWebViewDynamicBackgroundColor.png
new file mode 100644
index 000000000000..9c4616985d5b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyWebViewDynamicBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyzEditorPlaceholderWithAutoSizeDiabled.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyzEditorPlaceholderWithAutoSizeDiabled.png
new file mode 100644
index 000000000000..8aaf9be76931
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyzEditorPlaceholderWithAutoSizeDiabled.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyzEditorPlaceholderWithAutoSizeTextChanges.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyzEditorPlaceholderWithAutoSizeTextChanges.png
new file mode 100644
index 000000000000..7b4e28e059de
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyzEditorPlaceholderWithAutoSizeTextChanges.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyzEditorTextWhenAutoSizeDisabled.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyzEditorTextWhenAutoSizeDisabled.png
new file mode 100644
index 000000000000..24c05d69e740
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyzEditorTextWhenAutoSizeDisabled.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyzEditorTextWhenAutoSizeTextChangesSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyzEditorTextWhenAutoSizeTextChangesSet.png
new file mode 100644
index 000000000000..3526c3676d76
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/VerifyzEditorTextWhenAutoSizeTextChangesSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ViewShouldNotShiftOnShadowChanged.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ViewShouldNotShiftOnShadowChanged.png
new file mode 100644
index 000000000000..7cd688068875
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/ViewShouldNotShiftOnShadowChanged.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/WordWrapLineBreakModeNoExtraSpace.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/WordWrapLineBreakModeNoExtraSpace.png
new file mode 100644
index 000000000000..6a1489d57dd1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/WordWrapLineBreakModeNoExtraSpace.png differ
diff --git a/src/Controls/tests/TestCases.Shared.Tests/UITest.cs b/src/Controls/tests/TestCases.Shared.Tests/UITest.cs
index 5a7f2d1fc4c4..687c937f064f 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/UITest.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/UITest.cs
@@ -232,9 +232,14 @@ but both can happen.
 						var deviceScreenDensity = (long?)((AppiumApp)App).Driver.Capabilities.GetCapability("deviceScreenDensity")
 							?? throw new InvalidOperationException("deviceScreenDensity capability is missing or null.");
 
-						if (!(deviceApiLevel == 30 && deviceScreenSize == "1080x1920" && deviceScreenDensity == 420))
+						if (deviceApiLevel == 36)
 						{
-							Assert.Fail($"Android visual tests should be run on an API30 emulator image with 1080x1920 420dpi screen, but the current device is API {deviceApiLevel} with a {deviceScreenSize} {deviceScreenDensity}dpi screen. Follow the steps on the MAUI UI testing wiki to launch the Android emulator with the right image.");
+							environmentName = "android-notch-36";
+						}
+
+						if (!((deviceApiLevel == 30 && deviceScreenSize == "1080x1920" && deviceScreenDensity == 420) || (deviceApiLevel == 36 && deviceScreenSize == "1080x2424" && deviceScreenDensity == 420)))
+						{
+							Assert.Fail($"Android visual tests should be run on an API30 emulator image with 1080x1920 420dpi screen or API36 emulator image with 1080x2424 420dpi screen, but the current device is API {deviceApiLevel} with a {deviceScreenSize} {deviceScreenDensity}dpi screen. Follow the steps on the MAUI UI testing wiki to launch the Android emulator with the right image.");
 						}
 						break;
 
@@ -298,7 +303,7 @@ but both can happen.
 				// bar at the top as it varies slightly based on OS theme and is also not part of the app.
 				int cropFromTop = _testDevice switch
 				{
-					TestDevice.Android => 60,
+					TestDevice.Android => environmentName == "android-notch-36" ? 95 : 60,
 					TestDevice.iOS => environmentName == "ios-iphonex" ? 90 : 110,
 					TestDevice.Windows => 32,
 					TestDevice.Mac => 29,
@@ -317,7 +322,7 @@ but both can happen.
 				// For iOS, crop the home indicator at the bottom.
 				int cropFromBottom = _testDevice switch
 				{
-					TestDevice.Android => 125,
+					TestDevice.Android => environmentName == "android-notch-36" ? 40 : 125,
 					TestDevice.iOS => 40,
 					_ => 0,
 				};
@@ -464,4 +469,4 @@ byte[] TakeScreenshot()
 		}
 #endif
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/UITestCategories.cs b/src/Controls/tests/TestCases.Shared.Tests/UITestCategories.cs
index e8e39650a3ef..476b5977f38a 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/UITestCategories.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/UITestCategories.cs
@@ -74,5 +74,6 @@ internal static class UITestCategories
 		public const string Compatibility = "MovedFromCompatibility";
 		public const string GraphicsView = "GraphicsView";
 		public const string Fonts = "Fonts";
+		public const string SafeAreaEdges = "SafeAreaEdges";
 	}
-}
+}
\ No newline at end of file