diff --git a/e2e/safe-area/app/scrollview/action-bar/hscroll-vwrap-page.xml b/e2e/safe-area/app/scrollview/action-bar/hscroll-vwrap-page.xml
new file mode 100644
index 000000000..fa97eda99
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/action-bar/hscroll-vwrap-page.xml
@@ -0,0 +1,10 @@
+<Page class="page"
+    xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="scrollview/fragments">
+    
+    <ActionBar class="action-bar">
+        <Label class="action-bar-title" text="ScrollView Examples"></Label>
+    </ActionBar>
+
+    <fragments:hscroll-vwrap-fragment></fragments:hscroll-vwrap-fragment>
+</Page>
diff --git a/e2e/safe-area/app/scrollview/action-bar/vscroll-hwrap-page.xml b/e2e/safe-area/app/scrollview/action-bar/vscroll-hwrap-page.xml
new file mode 100644
index 000000000..15b5f0f20
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/action-bar/vscroll-hwrap-page.xml
@@ -0,0 +1,10 @@
+<Page class="page"
+    xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="scrollview/fragments">
+    
+    <ActionBar class="action-bar">
+        <Label class="action-bar-title" text="ScrollView Examples"></Label>
+    </ActionBar>
+
+    <fragments:vscroll-hwrap-fragment></fragments:vscroll-hwrap-fragment>
+</Page>
diff --git a/e2e/safe-area/app/scrollview/fragments/hscroll-hwrap-fragment.xml b/e2e/safe-area/app/scrollview/fragments/hscroll-hwrap-fragment.xml
index f1576162c..caf12e40e 100644
--- a/e2e/safe-area/app/scrollview/fragments/hscroll-hwrap-fragment.xml
+++ b/e2e/safe-area/app/scrollview/fragments/hscroll-hwrap-fragment.xml
@@ -1,20 +1,7 @@
 <ScrollView orientation="horizontal" backgroundColor="BurlyWood">
     <WrapLayout orientation="horizontal" backgroundColor="LightGreen">
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
     </WrapLayout>
 </ScrollView>
diff --git a/e2e/safe-area/app/scrollview/fragments/hscroll-vwrap-fragment.xml b/e2e/safe-area/app/scrollview/fragments/hscroll-vwrap-fragment.xml
new file mode 100644
index 000000000..109a691f7
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/fragments/hscroll-vwrap-fragment.xml
@@ -0,0 +1,35 @@
+<ScrollView orientation="horizontal" backgroundColor="BurlyWood">
+    <WrapLayout orientation="vertical" backgroundColor="LightGreen">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+</ScrollView>
diff --git a/e2e/safe-area/app/scrollview/fragments/vscroll-hwrap-fragment.xml b/e2e/safe-area/app/scrollview/fragments/vscroll-hwrap-fragment.xml
new file mode 100644
index 000000000..1b678b505
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/fragments/vscroll-hwrap-fragment.xml
@@ -0,0 +1,35 @@
+<ScrollView backgroundColor="BurlyWood">
+    <WrapLayout orientation="vertical" backgroundColor="LightGreen">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+</ScrollView>
diff --git a/e2e/safe-area/app/scrollview/fragments/vscroll-vwrap-fragment.xml b/e2e/safe-area/app/scrollview/fragments/vscroll-vwrap-fragment.xml
index 487638764..6b1a8e196 100644
--- a/e2e/safe-area/app/scrollview/fragments/vscroll-vwrap-fragment.xml
+++ b/e2e/safe-area/app/scrollview/fragments/vscroll-vwrap-fragment.xml
@@ -1,20 +1,40 @@
 <ScrollView backgroundColor="BurlyWood">
     <WrapLayout orientation="vertical" backgroundColor="LightGreen">
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
-        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
     </WrapLayout>
 </ScrollView>
diff --git a/e2e/safe-area/app/scrollview/no-action-bar/hscroll-vwrap-page.xml b/e2e/safe-area/app/scrollview/no-action-bar/hscroll-vwrap-page.xml
new file mode 100644
index 000000000..6821ecbea
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/no-action-bar/hscroll-vwrap-page.xml
@@ -0,0 +1,7 @@
+<Page class="page"
+    xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="scrollview/fragments"
+    actionBarHidden="true">
+
+    <fragments:hscroll-vwrap-fragment></fragments:hscroll-vwrap-fragment>
+</Page>
diff --git a/e2e/safe-area/app/scrollview/no-action-bar/vscroll-hwrap-page.xml b/e2e/safe-area/app/scrollview/no-action-bar/vscroll-hwrap-page.xml
new file mode 100644
index 000000000..20c6e0253
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/no-action-bar/vscroll-hwrap-page.xml
@@ -0,0 +1,7 @@
+<Page class="page"
+    xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="scrollview/fragments"
+    actionBarHidden="true">
+
+    <fragments:vscroll-hwrap-fragment></fragments:vscroll-hwrap-fragment>
+</Page>
diff --git a/e2e/safe-area/app/scrollview/scrollview-page.xml b/e2e/safe-area/app/scrollview/scrollview-page.xml
index 6a1054003..74ec156ab 100644
--- a/e2e/safe-area/app/scrollview/scrollview-page.xml
+++ b/e2e/safe-area/app/scrollview/scrollview-page.xml
@@ -11,6 +11,8 @@
             <Button text="VScroll VStack" tap="onNavigate" route="scrollview/action-bar/vscroll-vstack-page" />
             <Button text="HScroll HWrap" tap="onNavigate" route="scrollview/action-bar/hscroll-hwrap-page" />
             <Button text="VScroll VWrap" tap="onNavigate" route="scrollview/action-bar/vscroll-vwrap-page" />
+            <Button text="HScroll VWrap" tap="onNavigate" route="scrollview/action-bar/hscroll-vwrap-page" />
+            <Button text="VScroll HWrap" tap="onNavigate" route="scrollview/action-bar/vscroll-hwrap-page" />
             <Button text="Grid 3x3 HScroll HStack" tap="onNavigate" route="scrollview/action-bar/grid-3x3-hscroll-hstack-page" />
             <Button text="Grid 3x3 VScroll VStack" tap="onNavigate" route="scrollview/action-bar/grid-3x3-vscroll-vstack-page" />
         </StackLayout>
@@ -20,6 +22,8 @@
             <Button text="VScroll VStack" tap="onNavigate" route="scrollview/no-action-bar/vscroll-vstack-page" />
             <Button text="HScroll HWrap" tap="onNavigate" route="scrollview/no-action-bar/hscroll-hwrap-page" />
             <Button text="VScroll VWrap" tap="onNavigate" route="scrollview/no-action-bar/vscroll-vwrap-page" />
+            <Button text="HScroll VWrap" tap="onNavigate" route="scrollview/no-action-bar/hscroll-vwrap-page" />
+            <Button text="VScroll HWrap" tap="onNavigate" route="scrollview/no-action-bar/vscroll-hwrap-page" />
             <Button text="Grid 3x3 HScroll HStack" tap="onNavigate" route="scrollview/no-action-bar/grid-3x3-hscroll-hstack-page" />
             <Button text="Grid 3x3 VScroll VStack" tap="onNavigate" route="scrollview/no-action-bar/grid-3x3-vscroll-vstack-page" />
         </StackLayout>
diff --git a/e2e/safe-area/app/wraplayout/wraplayout-page.xml b/e2e/safe-area/app/wraplayout/wraplayout-page.xml
index 0af60cdf7..929833bda 100644
--- a/e2e/safe-area/app/wraplayout/wraplayout-page.xml
+++ b/e2e/safe-area/app/wraplayout/wraplayout-page.xml
@@ -8,20 +8,20 @@
         <StackLayout horizontalAlignment="center">
             <Label text="Pages w/ ActionBar"></Label>
             <Button text="HWrap" tap="onNavigate" route="wraplayout/action-bar/hwrap-page"></Button>
-            <Button text="HWrap Nested HWrap" tap="onNavigate" route="wraplayout/action-bar/hwrap-nested-hwrap-page"></Button>
-            <Button text="HWrap Nested VWrap" tap="onNavigate" route="wraplayout/action-bar/hwrap-nested-vwrap-page"></Button>
+            <!-- <Button text="HWrap Nested HWrap" tap="onNavigate" route="wraplayout/action-bar/hwrap-nested-hwrap-page"></Button>
+            <Button text="HWrap Nested VWrap" tap="onNavigate" route="wraplayout/action-bar/hwrap-nested-vwrap-page"></Button> -->
             <Button text="VWrap" tap="onNavigate" route="wraplayout/action-bar/vwrap-page"></Button>
-            <Button text="VWrap Nested HWrap" tap="onNavigate" route="wraplayout/action-bar/vwrap-nested-hwrap-page"></Button>
-            <Button text="VWrap Nested VWrap" tap="onNavigate" route="wraplayout/action-bar/vwrap-nested-vwrap-page"></Button>
+            <!-- <Button text="VWrap Nested HWrap" tap="onNavigate" route="wraplayout/action-bar/vwrap-nested-hwrap-page"></Button>
+            <Button text="VWrap Nested VWrap" tap="onNavigate" route="wraplayout/action-bar/vwrap-nested-vwrap-page"></Button> -->
         </StackLayout>
         <StackLayout horizontalAlignment="center">
             <Label text="Pages w/o ActionBar"></Label>
             <Button text="HWrap" tap="onNavigate" route="wraplayout/no-action-bar/hwrap-page"></Button>
-            <Button text="HWrap Nested HWrap" tap="onNavigate" route="wraplayout/no-action-bar/hwrap-nested-hwrap-page"></Button>
-            <Button text="HWrap Nested VWrap" tap="onNavigate" route="wraplayout/no-action-bar/hwrap-nested-vwrap-page"></Button>
+            <!-- <Button text="HWrap Nested HWrap" tap="onNavigate" route="wraplayout/no-action-bar/hwrap-nested-hwrap-page"></Button>
+            <Button text="HWrap Nested VWrap" tap="onNavigate" route="wraplayout/no-action-bar/hwrap-nested-vwrap-page"></Button> -->
             <Button text="VWrap" tap="onNavigate" route="wraplayout/no-action-bar/vwrap-page"></Button>
-            <Button text="VWrap Nested HWrap" tap="onNavigate" route="wraplayout/no-action-bar/vwrap-nested-hwrap-page"></Button>
-            <Button text="VWrap Nested VWrap" tap="onNavigate" route="wraplayout/no-action-bar/vwrap-nested-vwrap-page"></Button>
+            <!-- <Button text="VWrap Nested HWrap" tap="onNavigate" route="wraplayout/no-action-bar/vwrap-nested-hwrap-page"></Button>
+            <Button text="VWrap Nested VWrap" tap="onNavigate" route="wraplayout/no-action-bar/vwrap-nested-vwrap-page"></Button> -->
         </StackLayout>
         <StackLayout horizontalAlignment="center">
             <Label text="Docs Pages"></Label>