diff --git a/CompanionPane/build.gradle b/CompanionPane/build.gradle
index 553577f5..012854ac 100644
--- a/CompanionPane/build.gradle
+++ b/CompanionPane/build.gradle
@@ -30,7 +30,8 @@ dependencies {
     implementation androidxDependencies.ktxCore
     implementation androidxDependencies.ktxFragment
 
-    implementation microsoftDependencies.dualScreenLayout
+    implementation microsoftDependencies.screenManager
+    implementation microsoftDependencies.layouts
 
     testImplementation testDependencies.junit
 
diff --git a/CompanionPane/src/androidTest/java/com/microsoft/device/display/samples/companionpane/LayoutOrientationTest.kt b/CompanionPane/src/androidTest/java/com/microsoft/device/display/samples/companionpane/LayoutOrientationTest.kt
index 320dfac3..2647c8ea 100644
--- a/CompanionPane/src/androidTest/java/com/microsoft/device/display/samples/companionpane/LayoutOrientationTest.kt
+++ b/CompanionPane/src/androidTest/java/com/microsoft/device/display/samples/companionpane/LayoutOrientationTest.kt
@@ -27,7 +27,7 @@ class LayoutOrientationTest {
     private val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
 
     @get:Rule
-    val activityRule = ActivityTestRule<MainActivity>(MainActivity::class.java)
+    val activityRule = ActivityTestRule(MainActivity::class.java)
 
     @After
     fun resetOrientation() {
@@ -37,7 +37,7 @@ class LayoutOrientationTest {
 
     @Test
     fun shouldFindLayout_whenInSinglePortrait() {
-        onView(withId(R.id.single_screen_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.first_container_id)).check(matches(isDisplayed()))
         onView(withId(R.id.single_screen_layout_port)).check(matches(isDisplayed()))
     }
 
@@ -45,7 +45,7 @@ class LayoutOrientationTest {
     fun shouldFindLayout_whenInSingleLandscape() {
         rotateDevice()
 
-        onView(withId(R.id.single_screen_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.first_container_id)).check(matches(isDisplayed()))
         onView(withId(R.id.single_screen_layout_land)).check(matches(isDisplayed()))
     }
 
@@ -53,11 +53,11 @@ class LayoutOrientationTest {
     fun shouldFindLayouts_whenInDoublePortrait() {
         spanApplication()
 
-        onView(withId(R.id.dual_screen_start_container_id)).check(matches(isDisplayed()))
-        onView(withId(R.id.picture_dual_layout)).check(matches(isDisplayed()))
+        onView(withId(R.id.first_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.dual_screen_layout_land_start)).check(matches(isDisplayed()))
 
-        onView(withId(R.id.dual_screen_end_container_id)).check(matches(isDisplayed()))
-        onView(withId(R.id.tools_dual_layout_land)).check(matches(isDisplayed()))
+        onView(withId(R.id.second_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.dual_screen_layout_land_end)).check(matches(isDisplayed()))
     }
 
     @Test
@@ -65,33 +65,17 @@ class LayoutOrientationTest {
         spanApplication()
         rotateDevice()
 
-        onView(withId(R.id.dual_screen_start_container_id)).check(matches(isDisplayed()))
-        onView(withId(R.id.picture_dual_layout)).check(matches(isDisplayed()))
+        onView(withId(R.id.first_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.dual_screen_layout_port_start)).check(matches(isDisplayed()))
 
-        onView(withId(R.id.dual_screen_end_container_id)).check(matches(isDisplayed()))
-        onView(withId(R.id.tools_dual_layout_port)).check(matches(isDisplayed()))
-    }
-
-    @Test
-    fun shouldFindLayouts_whenSpanningInDoubleLandscape() {
-        rotateDevice()
-        spanLandscapeApplication()
-
-        onView(withId(R.id.dual_screen_start_container_id)).check(matches(isDisplayed()))
-        onView(withId(R.id.picture_dual_layout)).check(matches(isDisplayed()))
-
-        onView(withId(R.id.dual_screen_end_container_id)).check(matches(isDisplayed()))
-        onView(withId(R.id.tools_dual_layout_port)).check(matches(isDisplayed()))
+        onView(withId(R.id.second_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.dual_screen_layout_port_end)).check(matches(isDisplayed()))
     }
 
     private fun spanApplication() {
         device.swipe(675, 1780, 1350, 900, 400)
     }
 
-    private fun spanLandscapeApplication() {
-        device.swipe(1780, 2100, 1350, 1500, 400)
-    }
-
     private fun rotateDevice() {
         device.setOrientationLeft()
     }
diff --git a/CompanionPane/src/main/res/layout-land/dual_screen_layout_end.xml b/CompanionPane/src/main/res/layout-land/dual_screen_layout_end.xml
index 4f353044..824788b7 100644
--- a/CompanionPane/src/main/res/layout-land/dual_screen_layout_end.xml
+++ b/CompanionPane/src/main/res/layout-land/dual_screen_layout_end.xml
@@ -6,7 +6,7 @@
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/single_screen_layout_port"
+    android:id="@+id/dual_screen_layout_land_end"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:baselineAligned="false"
diff --git a/CompanionPane/src/main/res/layout-land/dual_screen_layout_start.xml b/CompanionPane/src/main/res/layout-land/dual_screen_layout_start.xml
index 5f895f4e..60c3918b 100644
--- a/CompanionPane/src/main/res/layout-land/dual_screen_layout_start.xml
+++ b/CompanionPane/src/main/res/layout-land/dual_screen_layout_start.xml
@@ -7,7 +7,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/single_screen_layout_port"
+    android:id="@+id/dual_screen_layout_land_start"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:baselineAligned="false"
diff --git a/CompanionPane/src/main/res/layout-port/dual_screen_layout_end.xml b/CompanionPane/src/main/res/layout-port/dual_screen_layout_end.xml
index aa6a7324..0f5918d7 100644
--- a/CompanionPane/src/main/res/layout-port/dual_screen_layout_end.xml
+++ b/CompanionPane/src/main/res/layout-port/dual_screen_layout_end.xml
@@ -6,7 +6,7 @@
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/single_screen_layout_port"
+    android:id="@+id/dual_screen_layout_port_end"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/large_padding"
diff --git a/CompanionPane/src/main/res/layout-port/dual_screen_layout_start.xml b/CompanionPane/src/main/res/layout-port/dual_screen_layout_start.xml
index 73b87fef..04fdd0e4 100644
--- a/CompanionPane/src/main/res/layout-port/dual_screen_layout_start.xml
+++ b/CompanionPane/src/main/res/layout-port/dual_screen_layout_start.xml
@@ -7,7 +7,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/single_screen_layout_port"
+    android:id="@+id/dual_screen_layout_port_start"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:baselineAligned="false"
diff --git a/CompanionPane/src/main/res/layout/activity_main.xml b/CompanionPane/src/main/res/layout/activity_main.xml
index 5365ab87..2fcd5ab9 100644
--- a/CompanionPane/src/main/res/layout/activity_main.xml
+++ b/CompanionPane/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
   ~
   -->
 
-<com.microsoft.device.dualscreen.layout.SurfaceDuoLayout
+<com.microsoft.device.dualscreen.layouts.SurfaceDuoLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/DragAndDrop/build.gradle b/DragAndDrop/build.gradle
index 0a2edbdf..40aba284 100644
--- a/DragAndDrop/build.gradle
+++ b/DragAndDrop/build.gradle
@@ -24,6 +24,10 @@ android {
 }
 
 dependencies {
+    implementation microsoftDependencies.screenManager
+    implementation microsoftDependencies.layouts
+    implementation microsoftDependencies.fragmentsHandler
+
     implementation kotlinDependencies.kotlinStdlib
     implementation androidxDependencies.appCompat
     implementation androidxDependencies.constraintLayout
@@ -31,8 +35,6 @@ dependencies {
     implementation androidxDependencies.ktxFragment
     implementation googleDependencies.material
 
-    implementation microsoftDependencies.dualScreenLayout
-
     testImplementation testDependencies.junit
 
     androidTestImplementation instrumentationTestDependencies.junit
diff --git a/DragAndDrop/src/main/AndroidManifest.xml b/DragAndDrop/src/main/AndroidManifest.xml
index 9ce711a8..98ab8290 100644
--- a/DragAndDrop/src/main/AndroidManifest.xml
+++ b/DragAndDrop/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) Microsoft Corporation. All rights reserved.
   ~ Licensed under the MIT License.
   ~
@@ -9,6 +8,7 @@
     package="com.microsoft.device.display.samples.draganddrop">
 
     <application
+        android:name=".DragAndDropApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/DragAndDrop/src/main/java/com/microsoft/device/display/samples/draganddrop/DragAndDropApplication.kt b/DragAndDrop/src/main/java/com/microsoft/device/display/samples/draganddrop/DragAndDropApplication.kt
new file mode 100644
index 00000000..4fef870f
--- /dev/null
+++ b/DragAndDrop/src/main/java/com/microsoft/device/display/samples/draganddrop/DragAndDropApplication.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
+package com.microsoft.device.display.samples.draganddrop
+
+import android.app.Application
+import com.microsoft.device.dualscreen.ScreenManagerProvider
+import com.microsoft.device.dualscreen.fragmentshandler.FragmentManagerStateHandler
+
+class DragAndDropApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        ScreenManagerProvider.init(this)
+        FragmentManagerStateHandler.init(this)
+    }
+}
\ No newline at end of file
diff --git a/DragAndDrop/src/main/java/com/microsoft/device/display/samples/draganddrop/MainActivity.kt b/DragAndDrop/src/main/java/com/microsoft/device/display/samples/draganddrop/MainActivity.kt
index 5ab483eb..6602fe63 100644
--- a/DragAndDrop/src/main/java/com/microsoft/device/display/samples/draganddrop/MainActivity.kt
+++ b/DragAndDrop/src/main/java/com/microsoft/device/display/samples/draganddrop/MainActivity.kt
@@ -10,38 +10,83 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.microsoft.device.display.samples.draganddrop.fragment.DragSourceFragment
 import com.microsoft.device.display.samples.draganddrop.fragment.DropTargetFragment
-import com.microsoft.device.dualscreen.layout.ScreenHelper
+import com.microsoft.device.dualscreen.ScreenInfo
+import com.microsoft.device.dualscreen.ScreenInfoListener
+import com.microsoft.device.dualscreen.ScreenManagerProvider
 import kotlinx.android.synthetic.main.activity_main.*
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity(), ScreenInfoListener {
+
+    companion object {
+        private const val FRAGMENT_SINGLE_SCREEN_DRAG_SOURCE = "FragmentSingleScreenDragSource"
+        private const val FRAGMENT_SINGLE_SCREEN_DROP_TARGET = "FragmentSingleScreenDropTarget"
+        private const val FRAGMENT_DUAL_SCREEN_DRAG_SOURCE = "FragmentDualScreenDragSource"
+        private const val FRAGMENT_DUAL_SCREEN_DROP_TARGET = "FragmentDualScreenDropTarget"
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
         reset_button.setOnClickListener { recreate() }
+    }
+
+    override fun onScreenInfoChanged(screenInfo: ScreenInfo) {
+        setupLayout(screenInfo)
+    }
 
-        if (!ScreenHelper.isDualMode(this)) {
+    override fun onResume() {
+        super.onResume()
+        ScreenManagerProvider.getScreenManager().addScreenInfoListener(this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        ScreenManagerProvider.getScreenManager().removeScreenInfoListener(this)
+    }
+
+    private fun setupLayout(screenInfo: ScreenInfo) {
+        if (!screenInfo.isDualMode()) {
+            setupLayoutForSingleScreen()
+        } else {
+            setupLayoutForDualScreen()
+        }
+    }
+
+    private fun setupLayoutForSingleScreen() {
+        if (supportFragmentManager.findFragmentByTag(FRAGMENT_SINGLE_SCREEN_DRAG_SOURCE) == null) {
             supportFragmentManager.beginTransaction()
                 .replace(
                     R.id.drag_source_container,
-                    DragSourceFragment.newInstance()
+                    DragSourceFragment.newInstance(),
+                    FRAGMENT_SINGLE_SCREEN_DRAG_SOURCE
                 ).commit()
+        }
+        if (supportFragmentManager.findFragmentByTag(FRAGMENT_SINGLE_SCREEN_DROP_TARGET) == null) {
             supportFragmentManager.beginTransaction()
                 .replace(
                     R.id.drop_target_container,
-                    DropTargetFragment.newInstance()
+                    DropTargetFragment.newInstance(),
+                    FRAGMENT_SINGLE_SCREEN_DROP_TARGET
                 ).commit()
-        } else {
+        }
+    }
+
+    private fun setupLayoutForDualScreen() {
+        if (supportFragmentManager.findFragmentByTag(FRAGMENT_DUAL_SCREEN_DRAG_SOURCE) == null) {
             supportFragmentManager.beginTransaction()
                 .replace(
-                    R.id.dual_screen_start_container_id,
-                    DragSourceFragment.newInstance()
+                    R.id.first_container_id,
+                    DragSourceFragment.newInstance(),
+                    FRAGMENT_DUAL_SCREEN_DRAG_SOURCE
                 ).commit()
+        }
+        if (supportFragmentManager.findFragmentByTag(FRAGMENT_DUAL_SCREEN_DROP_TARGET) == null) {
             supportFragmentManager.beginTransaction()
                 .replace(
-                    R.id.dual_screen_end_container_id,
-                    DropTargetFragment.newInstance()
+                    R.id.second_container_id,
+                    DropTargetFragment.newInstance(),
+                    FRAGMENT_DUAL_SCREEN_DROP_TARGET
                 ).commit()
         }
     }
diff --git a/DragAndDrop/src/main/res/layout/activity_main.xml b/DragAndDrop/src/main/res/layout/activity_main.xml
index c12bd114..29b5297b 100644
--- a/DragAndDrop/src/main/res/layout/activity_main.xml
+++ b/DragAndDrop/src/main/res/layout/activity_main.xml
@@ -10,7 +10,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.microsoft.device.dualscreen.layout.SurfaceDuoLayout
+    <com.microsoft.device.dualscreen.layouts.SurfaceDuoLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:single_screen_layout_id="@layout/single_screen"
diff --git a/DualView/build.gradle b/DualView/build.gradle
index fc6fc825..e777160c 100644
--- a/DualView/build.gradle
+++ b/DualView/build.gradle
@@ -31,7 +31,9 @@ dependencies {
     implementation androidxDependencies.ktxCore
     implementation androidxDependencies.ktxFragment
 
-    implementation microsoftDependencies.dualScreenLayout
+    implementation microsoftDependencies.screenManager
+    implementation microsoftDependencies.layouts
+    implementation microsoftDependencies.fragmentsHandler
 
     testImplementation testDependencies.junit
 
diff --git a/DualView/src/androidTest/java/com/microsoft/device/display/samples/contentcontext/LayoutModeTest.kt b/DualView/src/androidTest/java/com/microsoft/device/display/samples/contentcontext/LayoutModeTest.kt
index fcb27dfc..64a7d6e3 100644
--- a/DualView/src/androidTest/java/com/microsoft/device/display/samples/contentcontext/LayoutModeTest.kt
+++ b/DualView/src/androidTest/java/com/microsoft/device/display/samples/contentcontext/LayoutModeTest.kt
@@ -29,11 +29,11 @@ class LayoutModeTest {
     private val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
 
     @get:Rule
-    val activityRule = ActivityTestRule<MainActivity>(MainActivity::class.java)
+    val activityRule = ActivityTestRule(MainActivity::class.java)
 
     @Test
     fun openMapFromList_whenIsSingleScreen() {
-        onView(withId(R.id.single_screen_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.first_container_id)).check(matches(isDisplayed()))
         onView(withId(R.id.list_items)).check(matches(isDisplayed()))
 
         onView(withId(R.id.list_items)).perform(
@@ -46,8 +46,8 @@ class LayoutModeTest {
     fun displayListAndDetailsFromList_whenIsDualScreen() {
         spanApplication()
 
-        onView(withId(R.id.dual_screen_start_container_id)).check(matches(isDisplayed()))
-        onView(withId(R.id.dual_screen_end_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.first_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.second_container_id)).check(matches(isDisplayed()))
 
         onView(withId(R.id.list_items)).check(matches(isDisplayed()))
         onView(withId(R.id.img_view)).check(matches(isDisplayed()))
@@ -55,7 +55,7 @@ class LayoutModeTest {
 
     @Test
     fun displayListAndDetailsFromMap_whenIsDualScreen() {
-        onView(withId(R.id.single_screen_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.first_container_id)).check(matches(isDisplayed()))
         onView(withId(R.id.list_items)).check(matches(isDisplayed()))
 
         onView(withId(R.id.list_items)).perform(
@@ -64,8 +64,8 @@ class LayoutModeTest {
 
         spanApplication()
 
-        onView(withId(R.id.dual_screen_start_container_id)).check(matches(isDisplayed()))
-        onView(withId(R.id.dual_screen_end_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.first_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.second_container_id)).check(matches(isDisplayed()))
 
         onView(withId(R.id.list_items)).check(matches(isDisplayed()))
         onView(withId(R.id.img_view)).check(matches(isDisplayed()))
diff --git a/DualView/src/androidTest/java/com/microsoft/device/display/samples/contentcontext/ParcelableTest.kt b/DualView/src/androidTest/java/com/microsoft/device/display/samples/contentcontext/ParcelableTest.kt
deleted file mode 100644
index 5d2af378..00000000
--- a/DualView/src/androidTest/java/com/microsoft/device/display/samples/contentcontext/ParcelableTest.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- *
- */
-
-package com.microsoft.device.display.samples.contentcontext
-
-import android.os.Parcel
-import androidx.test.filters.SmallTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
-import com.microsoft.device.display.samples.contentcontext.model.Restaurant
-import org.hamcrest.MatcherAssert.assertThat
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.hamcrest.CoreMatchers.`is` as iz
-
-@RunWith(AndroidJUnit4ClassRunner::class)
-@SmallTest
-class ParcelableTest {
-
-    @Test
-    fun shouldReturnCorrectFields_whenParcelingObject() {
-        val mockTitle = "title"
-        val mockResId = 5
-        val mockRating = 3.3
-        val mockVotes = 1435
-        val mockType = Restaurant.Type.Thai
-        val mockPriceRange = 4
-        val mockDescription = "description"
-        val item = Restaurant(
-            mockTitle,
-            mockResId,
-            mockRating,
-            mockVotes,
-            mockType,
-            mockPriceRange,
-            mockDescription,
-            mockResId
-        )
-        val parcel = Parcel.obtain()
-        item.writeToParcel(parcel, 0)
-        parcel.setDataPosition(0)
-
-        val createFromParcel = Restaurant.CREATOR.createFromParcel(parcel)
-
-        assertThat(
-            "Title field is not parceled correctly",
-            mockTitle,
-            iz(createFromParcel.title)
-        )
-        assertThat(
-            "ImageResourceId field is not parceled correctly",
-            mockResId,
-            iz(createFromParcel.imageResourceId)
-        )
-        assertThat(
-            "Rating field is not parceled correctly",
-            mockRating,
-            iz(createFromParcel.rating)
-        )
-        assertThat(
-            "VoteCount field is not parceled correctly",
-            mockVotes,
-            iz(createFromParcel.voteCount)
-        )
-        assertThat(
-            "Type field is not parceled correctly",
-            mockType,
-            iz(createFromParcel.type)
-        )
-        assertThat(
-            "PriceRange field is not parceled correctly",
-            mockPriceRange,
-            iz(createFromParcel.priceRange)
-        )
-        assertThat(
-            "Description field is not parceled correctly",
-            mockDescription,
-            iz(createFromParcel.description)
-        )
-        assertThat(
-            "MapImageResourceId field is not parceled correctly",
-            mockResId,
-            iz(createFromParcel.mapImageResourceId)
-        )
-    }
-}
diff --git a/DualView/src/main/AndroidManifest.xml b/DualView/src/main/AndroidManifest.xml
index 473db297..d169aeee 100644
--- a/DualView/src/main/AndroidManifest.xml
+++ b/DualView/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <application
+        android:name=".DualViewApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/DualViewApp.kt b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/DualViewApp.kt
new file mode 100644
index 00000000..58f1b80a
--- /dev/null
+++ b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/DualViewApp.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
+package com.microsoft.device.display.samples.contentcontext
+
+import android.app.Application
+import com.microsoft.device.dualscreen.ScreenManagerProvider
+import com.microsoft.device.dualscreen.fragmentshandler.FragmentManagerStateHandler
+
+class DualViewApp : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        ScreenManagerProvider.init(this)
+        FragmentManagerStateHandler.init(this)
+    }
+}
diff --git a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/ListFragment.kt b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/ListFragment.kt
index ded6647f..100592d1 100644
--- a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/ListFragment.kt
+++ b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/ListFragment.kt
@@ -12,20 +12,24 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
+import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.RecyclerView
-import com.microsoft.device.display.samples.contentcontext.model.DataProvider
 import com.microsoft.device.display.samples.contentcontext.model.Restaurant
 import com.microsoft.device.display.samples.contentcontext.view.RestaurantAdapter
 import com.microsoft.device.display.samples.contentcontext.view.SelectedViewModel
-import com.microsoft.device.dualscreen.layout.ScreenHelper
+import com.microsoft.device.display.samples.contentcontext.view.SelectedViewModel.Companion.NO_ITEM_SELECTED
+import com.microsoft.device.dualscreen.ScreenInfo
+import com.microsoft.device.dualscreen.ScreenInfoListener
+import com.microsoft.device.dualscreen.ScreenInfoProvider
+import com.microsoft.device.dualscreen.ScreenManagerProvider
 
-class ListFragment : Fragment() {
+class ListFragment : Fragment(), ScreenInfoListener {
     private var adapterItems: RestaurantAdapter? = null
     private val selectedViewModel: SelectedViewModel by activityViewModels()
+    private lateinit var listToolbar: Toolbar
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -34,56 +38,56 @@ class ListFragment : Fragment() {
     ): View? {
         val layout = inflater.inflate(R.layout.fragment_items_list, container, false)
 
-        val recyclerView = layout.findViewById<RecyclerView>(R.id.list_items)
-
-        activity?.let {
-            if (!ScreenHelper.isDualMode(it)) {
-                selectedViewModel.selectedPosition.value = -1
-            }
+        activity?.let { activity ->
+            val recyclerView = layout.findViewById<RecyclerView>(R.id.list_items)
 
             adapterItems =
                 RestaurantAdapter(
-                    it,
-                    DataProvider.restaurants,
-                    selectedViewModel.selectedPosition.value ?: -1,
+                    activity,
+                    selectedViewModel,
                     ::onItemClick
                 )
             recyclerView.adapter = adapterItems
+            recyclerView.setHasFixedSize(true)
 
             val divider = DividerItemDecoration(context, DividerItemDecoration.VERTICAL)
-            divider.setDrawable(resources.getDrawable(R.drawable.item_divider, null))
+            ResourcesCompat.getDrawable(resources, R.drawable.item_divider, null)?.let {
+                divider.setDrawable(it)
+            }
             recyclerView.addItemDecoration(divider)
-            addSelectionObserver()
+
+            listToolbar = layout.findViewById(R.id.list_toolbar)
+            listToolbar.inflateMenu(R.menu.menu_list)
+            listToolbar.setOnMenuItemClickListener { onMenuItemSelected(it) }
         }
 
-        handleSpannedModeSelection()
+        return layout
+    }
 
-        val listToolbar = layout.findViewById<Toolbar>(R.id.list_toolbar)
-        listToolbar.inflateMenu(R.menu.menu_list)
-        listToolbar.setOnMenuItemClickListener { onMenuItemSelected(it) }
+    override fun onScreenInfoChanged(screenInfo: ScreenInfo) {
+        if (!screenInfo.isDualMode()) {
+            adapterItems?.selectItem(NO_ITEM_SELECTED)
+        }
 
-        activity?.takeIf { ScreenHelper.isDualMode(it) }?.let {
+        if (screenInfo.isDualMode()) {
             listToolbar.menu?.findItem(R.id.action_map)?.isVisible = false
         }
+    }
 
-        return layout
+    override fun onStart() {
+        super.onStart()
+        ScreenManagerProvider.getScreenManager().addScreenInfoListener(this)
     }
 
-    private fun addSelectionObserver() {
-        selectedViewModel.selectedPosition.observe(
-            requireActivity(),
-            Observer {
-                if (it != -1) {
-                    adapterItems?.selectItem(it)
-                }
-            }
-        )
+    override fun onResume() {
+        super.onResume()
+        ScreenManagerProvider.getScreenManager().removeScreenInfoListener(this)
     }
 
     private fun onMenuItemSelected(menuItem: MenuItem): Boolean {
         return when (menuItem.itemId) {
             R.id.action_map -> {
-                startDetailsFragment(null)
+                startDetailsFragment(NO_ITEM_SELECTED)
                 true
             }
             else -> false
@@ -92,45 +96,28 @@ class ListFragment : Fragment() {
 
     private fun onItemClick(item: Restaurant) {
         activity?.let { activity ->
-            if (ScreenHelper.isDualMode(activity)) {
-                if (selectedViewModel.selectedPosition.value != adapterItems?.getItemPosition(item)) {
-                    selectedViewModel.selectedPosition.value = adapterItems?.getItemPosition(item)
-                    parentFragmentManager
-                        .beginTransaction()
-                        .replace(
-                            R.id.dual_screen_end_container_id,
-                            MapFragment.newInstance(item), null
-                        )
-                        .commit()
-                }
+            if (ScreenInfoProvider.getScreenInfo(activity).isDualMode()) {
+                adapterItems?.selectItem(selectedViewModel.getItemPosition(item))
+                parentFragmentManager
+                    .beginTransaction()
+                    .replace(
+                        R.id.second_container_id,
+                        MapFragment(), null
+                    )
+                    .commit()
             } else {
-                startDetailsFragment(item)
+                startDetailsFragment(selectedViewModel.getItemPosition(item))
             }
         }
     }
 
-    private fun startDetailsFragment(item: Restaurant?) {
+    private fun startDetailsFragment(pos: Int) {
+        adapterItems?.selectItem(pos)
         parentFragmentManager.beginTransaction()
             .replace(
-                R.id.single_screen_container_id,
-                MapFragment.newInstance(item), null
+                R.id.first_container_id,
+                MapFragment(), null
             ).addToBackStack(null)
             .commit()
     }
-
-    private fun handleSpannedModeSelection() {
-        activity?.takeIf { ScreenHelper.isDualMode(it) }?.let { _ ->
-            var selectedItem: Restaurant? = null
-            selectedViewModel.selectedPosition.value?.let {
-                selectedItem = adapterItems?.getItem(it)
-            }
-            parentFragmentManager
-                .beginTransaction()
-                .replace(
-                    R.id.dual_screen_end_container_id,
-                    MapFragment.newInstance(selectedItem), null
-                )
-                .commit()
-        }
-    }
 }
diff --git a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/MainActivity.kt b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/MainActivity.kt
index ae472aa0..264b223e 100644
--- a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/MainActivity.kt
+++ b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/MainActivity.kt
@@ -7,11 +7,59 @@
 package com.microsoft.device.display.samples.contentcontext
 
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
+import com.microsoft.device.dualscreen.ScreenInfo
+import com.microsoft.device.dualscreen.ScreenInfoListener
+import com.microsoft.device.dualscreen.ScreenManagerProvider
+
+class MainActivity : FragmentActivity(), ScreenInfoListener {
+    companion object {
+        private const val FRAGMENT_DUAL_START = "FragmentDualStart"
+        private const val FRAGMENT_DUAL_END = "FragmentDualEnd"
+        private const val FRAGMENT_SINGLE_SCREEN = "FragmentSingleScreen"
+    }
 
-class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
     }
-}
\ No newline at end of file
+
+    override fun onStart() {
+        super.onStart()
+        ScreenManagerProvider.getScreenManager().addScreenInfoListener(this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        ScreenManagerProvider.getScreenManager().removeScreenInfoListener(this)
+    }
+
+    override fun onScreenInfoChanged(screenInfo: ScreenInfo) {
+        if (screenInfo.isDualMode()) {
+            setupDualScreenFragments()
+        } else {
+            setupSingleScreenFragments()
+        }
+    }
+
+    private fun setupSingleScreenFragments() {
+        if (supportFragmentManager.findFragmentByTag(FRAGMENT_SINGLE_SCREEN) == null) {
+            supportFragmentManager.beginTransaction()
+                .replace(R.id.first_container_id, ListFragment(), FRAGMENT_SINGLE_SCREEN)
+                .commit()
+        }
+    }
+    private fun setupDualScreenFragments() {
+        if (supportFragmentManager.findFragmentByTag(FRAGMENT_DUAL_START) == null &&
+            supportFragmentManager.findFragmentByTag(FRAGMENT_DUAL_END) == null
+        ) {
+            supportFragmentManager.beginTransaction()
+                .replace(R.id.first_container_id, ListFragment(), FRAGMENT_DUAL_START)
+                .commit()
+
+            supportFragmentManager.beginTransaction()
+                .replace(R.id.second_container_id, MapFragment(), FRAGMENT_DUAL_END)
+                .commit()
+        }
+    }
+}
diff --git a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/MapFragment.kt b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/MapFragment.kt
index 5e35b0e8..72b84d33 100644
--- a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/MapFragment.kt
+++ b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/MapFragment.kt
@@ -14,21 +14,17 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
-import com.microsoft.device.display.samples.contentcontext.model.Restaurant
+import androidx.fragment.app.activityViewModels
 import com.microsoft.device.display.samples.contentcontext.view.MapImageView
-import com.microsoft.device.dualscreen.layout.ScreenHelper
+import com.microsoft.device.display.samples.contentcontext.view.SelectedViewModel
+import com.microsoft.device.display.samples.contentcontext.view.SelectedViewModel.Companion.NO_ITEM_SELECTED
+import com.microsoft.device.dualscreen.ScreenInfo
+import com.microsoft.device.dualscreen.ScreenInfoListener
+import com.microsoft.device.dualscreen.ScreenManagerProvider
 
-class MapFragment : Fragment() {
-
-    companion object {
-        internal fun newInstance(item: Restaurant?) = MapFragment().apply {
-            item?.let {
-                arguments = Bundle().apply {
-                    this.putParcelable(Restaurant.KEY, item)
-                }
-            }
-        }
-    }
+class MapFragment : Fragment(), ScreenInfoListener {
+    private lateinit var detailToolbar: Toolbar
+    private val selectedViewModel: SelectedViewModel by activityViewModels()
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -38,37 +34,54 @@ class MapFragment : Fragment() {
         val layout = inflater.inflate(R.layout.fragment_item_detail, container, false)
         val mapView = layout?.findViewById<MapImageView>(R.id.img_view)
 
-        if (arguments != null) {
-            val item = requireArguments().getParcelable<Restaurant>(Restaurant.KEY)
-            if (item != null && item.mapImageResourceId != 0) {
-                mapView?.setImageResource(item.mapImageResourceId)
-            } else {
-                mapView?.setImageResource(R.drawable.unselected_map)
+        selectedViewModel.selectedPosition.observe(
+            viewLifecycleOwner,
+            {
+                if (it != NO_ITEM_SELECTED) {
+                    val item = selectedViewModel.getItem(it)
+                    if (item != null && item.mapImageResourceId != 0) {
+                        mapView?.setImageResource(item.mapImageResourceId)
+                    } else {
+                        mapView?.setImageResource(R.drawable.unselected_map)
+                    }
+                } else {
+                    mapView?.setImageResource(R.drawable.unselected_map)
+                }
             }
-        } else {
-            mapView?.setImageResource(R.drawable.unselected_map)
-        }
+        )
 
-        val detailToolbar = layout?.findViewById<Toolbar>(R.id.detail_toolbar)
-        activity?.let { activity ->
-            if (ScreenHelper.isDualMode(activity)) {
-                when (ScreenHelper.getCurrentRotation(activity)) {
-                    Surface.ROTATION_0, Surface.ROTATION_180 -> {
-                        detailToolbar?.visibility = View.VISIBLE
-                    }
-                    Surface.ROTATION_90, Surface.ROTATION_270 ->
-                        detailToolbar?.visibility = View.GONE
-                    else -> {
-                        detailToolbar?.visibility = View.VISIBLE
-                    }
+        detailToolbar = layout.findViewById(R.id.detail_toolbar)
+
+        return layout
+    }
+
+    override fun onScreenInfoChanged(screenInfo: ScreenInfo) {
+        if (screenInfo.isDualMode()) {
+            when (screenInfo.getScreenRotation()) {
+                Surface.ROTATION_0, Surface.ROTATION_180 -> {
+                    detailToolbar.visibility = View.VISIBLE
+                }
+                Surface.ROTATION_90, Surface.ROTATION_270 ->
+                    detailToolbar.visibility = View.GONE
+                else -> {
+                    detailToolbar.visibility = View.VISIBLE
                 }
-            } else {
-                detailToolbar?.title = activity.resources.getString(R.string.app_name)
-                detailToolbar?.inflateMenu(R.menu.menu_map)
-                detailToolbar?.setOnMenuItemClickListener { onMenuItemSelected(it) }
             }
+        } else {
+            detailToolbar.title = resources.getString(R.string.app_name)
+            detailToolbar.inflateMenu(R.menu.menu_map)
+            detailToolbar.setOnMenuItemClickListener { onMenuItemSelected(it) }
         }
-        return layout
+    }
+
+    override fun onStart() {
+        super.onStart()
+        ScreenManagerProvider.getScreenManager().addScreenInfoListener(this)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        ScreenManagerProvider.getScreenManager().removeScreenInfoListener(this)
     }
 
     private fun onMenuItemSelected(menuItem: MenuItem): Boolean {
diff --git a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/model/Restaurant.kt b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/model/Restaurant.kt
index 5c776a30..c21748f7 100644
--- a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/model/Restaurant.kt
+++ b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/model/Restaurant.kt
@@ -6,9 +6,6 @@
 
 package com.microsoft.device.display.samples.contentcontext.model
 
-import android.os.Parcel
-import android.os.Parcelable
-
 data class Restaurant(
     val title: String? = "",
     val imageResourceId: Int = 0,
@@ -18,7 +15,7 @@ data class Restaurant(
     val priceRange: Int = 0,
     val description: String? = "",
     val mapImageResourceId: Int = 0
-) : Parcelable {
+) {
 
     enum class Type(private val label: String) {
         American("American"),
@@ -32,47 +29,4 @@ data class Restaurant(
             return label
         }
     }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeString(title)
-        dest.writeInt(imageResourceId)
-        dest.writeDouble(rating)
-        dest.writeInt(voteCount)
-        dest.writeString(type.toString())
-        dest.writeInt(priceRange)
-        dest.writeString(description)
-        dest.writeInt(mapImageResourceId)
-    }
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    companion object CREATOR : Parcelable.Creator<Restaurant> {
-        const val KEY = "Restaurant"
-
-        override fun createFromParcel(source: Parcel): Restaurant {
-            val title = source.readString()
-            val imageResourceId = source.readInt()
-            val rating = source.readDouble()
-            val voteCount = source.readInt()
-            val type = source.readString() ?: "American"
-            val priceRange = source.readInt()
-            val description = source.readString()
-            val mapImageResourceId = source.readInt()
-            return Restaurant(
-                title,
-                imageResourceId,
-                rating, voteCount,
-                Type.valueOf(type),
-                priceRange,
-                description,
-                mapImageResourceId
-            )
-        }
-
-        override fun newArray(size: Int): Array<Restaurant?> {
-            return arrayOfNulls(size)
-        }
-    }
 }
diff --git a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/view/MapImageView.kt b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/view/MapImageView.kt
index d31f6908..964111d2 100644
--- a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/view/MapImageView.kt
+++ b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/view/MapImageView.kt
@@ -22,7 +22,7 @@ class MapImageView : AppCompatImageView {
         internal const val NONE = 0
         internal const val DRAG = 1
         internal const val ZOOM = 2
-        internal const val DISTANCE_UNTIL_WATERMARK = 800
+        internal const val DISTANCE_UNTIL_WATERMARK = 1000
         internal const val SCALE_FACTOR = 0.5f
     }
 
@@ -50,14 +50,14 @@ class MapImageView : AppCompatImageView {
         setOnTouchListener(MyTouch())
     }
 
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        super.onLayout(changed, left, top, right, bottom)
 
         drawable?.let {
             val x = (width - drawable.intrinsicWidth.toFloat() * SCALE_FACTOR) / 2 -
-                (DISTANCE_UNTIL_WATERMARK / 2)
-            val y = (height - drawable.intrinsicHeight.toFloat() * SCALE_FACTOR) / 2 -
                 DISTANCE_UNTIL_WATERMARK
+            val y = (height - drawable.intrinsicHeight.toFloat() * SCALE_FACTOR) / 2 -
+                DISTANCE_UNTIL_WATERMARK * 2
             matrix.preScale(SCALE_FACTOR, SCALE_FACTOR)
             matrix.preTranslate(x, y)
             this.imageMatrix = matrix
diff --git a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/view/RestaurantAdapter.kt b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/view/RestaurantAdapter.kt
index 829e6440..b5063340 100644
--- a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/view/RestaurantAdapter.kt
+++ b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/view/RestaurantAdapter.kt
@@ -18,11 +18,11 @@ import com.microsoft.device.display.samples.contentcontext.R
 import com.microsoft.device.display.samples.contentcontext.model.Restaurant
 import com.microsoft.device.display.samples.contentcontext.util.formatPriceRange
 import com.microsoft.device.display.samples.contentcontext.util.formatRating
+import com.microsoft.device.display.samples.contentcontext.view.SelectedViewModel.Companion.NO_ITEM_SELECTED
 
 class RestaurantAdapter(
     context: Context,
-    private val items: List<Restaurant>,
-    private var selectedPosition: Int = -1,
+    private val viewModel: SelectedViewModel,
     private val onClick: (item: Restaurant) -> Unit
 ) : RecyclerView.Adapter<RestaurantAdapter.RestaurantViewHolder>() {
 
@@ -34,20 +34,21 @@ class RestaurantAdapter(
         )
 
     override fun onBindViewHolder(holder: RestaurantViewHolder, position: Int) {
-        holder.bind(items[position], onClick, position == selectedPosition)
+        holder.bind(
+            viewModel.getItem(position)!!,
+            onClick,
+            position == viewModel.selectedPosition.value
+        )
     }
 
-    override fun getItemCount() = items.size
-
-    fun getItem(pos: Int) = items.takeIf { items.size > pos && pos >= 0 }?.get(pos)
-
-    fun getItemPosition(item: Restaurant) = items.indexOf(item)
+    override fun getItemCount() = viewModel.listItems.size
 
     fun selectItem(pos: Int) {
-        val oldPosition = selectedPosition
-        selectedPosition = pos
-        notifyItemChanged(selectedPosition)
-        notifyItemChanged(oldPosition)
+        viewModel.selectedPosition.value?.takeIf { it != NO_ITEM_SELECTED }?.let {
+            notifyItemChanged(it)
+        }
+        viewModel.setSelectedPosition(pos)
+        notifyItemChanged(pos)
     }
 
     class RestaurantViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
diff --git a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/view/SelectedViewModel.kt b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/view/SelectedViewModel.kt
index b4ceeb2a..a0e61146 100644
--- a/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/view/SelectedViewModel.kt
+++ b/DualView/src/main/java/com/microsoft/device/display/samples/contentcontext/view/SelectedViewModel.kt
@@ -8,7 +8,24 @@ package com.microsoft.device.display.samples.contentcontext.view
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.microsoft.device.display.samples.contentcontext.model.DataProvider
+import com.microsoft.device.display.samples.contentcontext.model.Restaurant
 
 class SelectedViewModel : ViewModel() {
-    val selectedPosition: MutableLiveData<Int> = MutableLiveData(-1)
+    val listItems = DataProvider.restaurants
+    val selectedPosition: MutableLiveData<Int> = MutableLiveData(NO_ITEM_SELECTED)
+
+    fun getItem(pos: Int) = listItems.takeIf { it.size > pos && pos >= 0 }?.get(pos)
+
+    fun getItemPosition(item: Restaurant) = listItems.indexOf(item)
+
+    fun setSelectedPosition(pos: Int) {
+        if (pos != selectedPosition.value) {
+            selectedPosition.value = pos
+        }
+    }
+
+    companion object {
+        const val NO_ITEM_SELECTED = -1
+    }
 }
diff --git a/DualView/src/main/res/layout/activity_main.xml b/DualView/src/main/res/layout/activity_main.xml
index a96e8382..121f3c22 100644
--- a/DualView/src/main/res/layout/activity_main.xml
+++ b/DualView/src/main/res/layout/activity_main.xml
@@ -6,13 +6,12 @@
   ~
   -->
 
-<com.microsoft.device.dualscreen.layout.SurfaceDuoLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.microsoft.device.dualscreen.layouts.SurfaceDuoLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:single_screen_layout_id="@layout/single_screen_layout"
-    app:dual_screen_start_layout_id="@layout/dual_screen_start_layout"
     app:show_in_single_screen="@layout/fragment_items_list"
     app:show_in_dual_screen_start="@layout/fragment_items_list"
     app:show_in_dual_screen_end="@layout/fragment_item_detail"
diff --git a/HingeAngle/build.gradle b/HingeAngle/build.gradle
index 001d20a9..d43ac4cd 100644
--- a/HingeAngle/build.gradle
+++ b/HingeAngle/build.gradle
@@ -1,8 +1,5 @@
 /*
- *
- *  * Copyright (c) Microsoft Corporation. All rights reserved.
- *  * Licensed under the MIT License.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
  */
 
 apply plugin: 'com.android.application'
@@ -25,6 +22,10 @@ android {
 }
 
 dependencies {
+    implementation microsoftDependencies.screenManager
+    implementation microsoftDependencies.layouts
+    implementation microsoftDependencies.fragmentsHandler
+
     implementation kotlinDependencies.kotlinStdlib
     implementation androidxDependencies.appCompat
     implementation androidxDependencies.constraintLayout
@@ -32,8 +33,6 @@ dependencies {
     implementation androidxDependencies.ktxFragment
     implementation androidxDependencies.locaBroadcastManager
 
-    implementation microsoftDependencies.dualScreenLayout
-
     testImplementation testDependencies.junit
     androidTestImplementation instrumentationTestDependencies.junit
     androidTestImplementation instrumentationTestDependencies.espressoCore
diff --git a/HingeAngle/src/main/AndroidManifest.xml b/HingeAngle/src/main/AndroidManifest.xml
index 97126045..b1f101bb 100644
--- a/HingeAngle/src/main/AndroidManifest.xml
+++ b/HingeAngle/src/main/AndroidManifest.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ /*
-  ~  * Copyright (c) Microsoft Corporation. All rights reserved.
-  ~  * Licensed under the MIT License.
-  ~  */
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -12,6 +9,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
+        android:name=".HingeAngleApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/DualScreenFragment.kt b/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/DualScreenFragment.kt
index 1c048309..ffbc0648 100644
--- a/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/DualScreenFragment.kt
+++ b/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/DualScreenFragment.kt
@@ -1,8 +1,5 @@
 /*
- *
- *  * Copyright (c) Microsoft Corporation. All rights reserved.
- *  * Licensed under the MIT License.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
  */
 
 package com.microsoft.device.display.samples.hingeangle
diff --git a/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/HingeAngleApplication.kt b/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/HingeAngleApplication.kt
new file mode 100644
index 00000000..3afb3a2b
--- /dev/null
+++ b/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/HingeAngleApplication.kt
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
+ */
+
+package com.microsoft.device.display.samples.hingeangle
+
+import android.app.Application
+import com.microsoft.device.dualscreen.ScreenManagerProvider
+
+class HingeAngleApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        ScreenManagerProvider.init(this)
+    }
+}
\ No newline at end of file
diff --git a/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/MainActivity.kt b/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/MainActivity.kt
index 6ea6d960..0b56ac25 100644
--- a/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/MainActivity.kt
+++ b/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/MainActivity.kt
@@ -1,51 +1,68 @@
 /*
- *
- *  * Copyright (c) Microsoft Corporation. All rights reserved.
- *  * Licensed under the MIT License.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
  */
 
 package com.microsoft.device.display.samples.hingeangle
 
 import android.os.Bundle
-import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
-import com.microsoft.device.dualscreen.layout.ScreenHelper
+import com.microsoft.device.dualscreen.ScreenInfo
+import com.microsoft.device.dualscreen.ScreenInfoListener
+import com.microsoft.device.dualscreen.ScreenManagerProvider
 
-class MainActivity : AppCompatActivity() {
-
-    private val DEBUG_TAG = "MainActivity"
+class MainActivity : AppCompatActivity(), ScreenInfoListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        ScreenManagerProvider.getScreenManager().addScreenInfoListener(this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        ScreenManagerProvider.getScreenManager().removeScreenInfoListener(this)
+    }
 
-        if (ScreenHelper.isDualMode(this)) {
-            Log.d(DEBUG_TAG, "########### dual mode")
-
-            supportFragmentManager
-                .beginTransaction()
-                .replace(
-                    R.id.dual_screen_start_container_id,
-                    SingleScreenFragment(),
-                    null
-                ).commit()
-            supportFragmentManager
-                .beginTransaction()
-                .replace(
-                    R.id.dual_screen_end_container_id,
-                    DualScreenFragment(),
-                    null
-                ).commit()
+    override fun onScreenInfoChanged(screenInfo: ScreenInfo) {
+        setupLayout(screenInfo)
+    }
+
+    private fun setupLayout(screenInfo: ScreenInfo) {
+        if (screenInfo.isDualMode()) {
+            useDualMode(screenInfo)
         } else {
-            Log.d(DEBUG_TAG, "########### single mode")
-            supportFragmentManager
-                .beginTransaction()
-                .replace(
-                    R.id.single_screen_container_id,
-                    SingleScreenFragment(),
-                    null
-                ).commit()
+            useSingleMode()
         }
     }
+
+    private fun useDualMode(screenInfo: ScreenInfo) {
+        supportFragmentManager
+            .beginTransaction()
+            .replace(
+                R.id.first_container_id,
+                SingleScreenFragment(),
+                null
+            ).commit()
+        supportFragmentManager
+            .beginTransaction()
+            .replace(
+                R.id.second_container_id,
+                DualScreenFragment(),
+                null
+            ).commit()
+    }
+
+    private fun useSingleMode() {
+        supportFragmentManager
+            .beginTransaction()
+            .replace(
+                R.id.first_container_id,
+                SingleScreenFragment(),
+                null
+            ).commit()
+    }
 }
\ No newline at end of file
diff --git a/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/PenDrawView.kt b/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/PenDrawView.kt
index a36b6ef3..87a841be 100644
--- a/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/PenDrawView.kt
+++ b/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/PenDrawView.kt
@@ -1,8 +1,5 @@
 /*
- *
- *  * Copyright (c) Microsoft Corporation. All rights reserved.
- *  * Licensed under the MIT License.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
  */
 
 package com.microsoft.device.display.samples.hingeangle
diff --git a/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/SingleScreenFragment.kt b/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/SingleScreenFragment.kt
index 92fe894b..7db79613 100644
--- a/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/SingleScreenFragment.kt
+++ b/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/SingleScreenFragment.kt
@@ -1,8 +1,5 @@
 /*
- *
- *  * Copyright (c) Microsoft Corporation. All rights reserved.
- *  * Licensed under the MIT License.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
  */
 
 package com.microsoft.device.display.samples.hingeangle
diff --git a/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/model/ViewModel.kt b/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/model/ViewModel.kt
index 35ca1179..e5224f51 100644
--- a/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/model/ViewModel.kt
+++ b/HingeAngle/src/main/java/com/microsoft/device/display/samples/hingeangle/model/ViewModel.kt
@@ -1,8 +1,5 @@
 /*
- *
- *  * Copyright (c) Microsoft Corporation. All rights reserved.
- *  * Licensed under the MIT License.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
  */
 
 package com.microsoft.device.display.samples.hingeangle.model
diff --git a/HingeAngle/src/main/res/drawable-v24/ic_launcher_foreground.xml b/HingeAngle/src/main/res/drawable-v24/ic_launcher_foreground.xml
index ccb872b7..930c38cd 100644
--- a/HingeAngle/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/HingeAngle/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,8 +1,5 @@
 <!--
-  ~ /*
-  ~  * Copyright (c) Microsoft Corporation. All rights reserved.
-  ~  * Licensed under the MIT License.
-  ~  */
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/HingeAngle/src/main/res/drawable/ic_launcher_background.xml b/HingeAngle/src/main/res/drawable/ic_launcher_background.xml
index 55dde35e..83ff8bdc 100644
--- a/HingeAngle/src/main/res/drawable/ic_launcher_background.xml
+++ b/HingeAngle/src/main/res/drawable/ic_launcher_background.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ /*
-  ~  * Copyright (c) Microsoft Corporation. All rights reserved.
-  ~  * Licensed under the MIT License.
-  ~  */
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/HingeAngle/src/main/res/layout/activity_main.xml b/HingeAngle/src/main/res/layout/activity_main.xml
index e726eb96..98845bc0 100644
--- a/HingeAngle/src/main/res/layout/activity_main.xml
+++ b/HingeAngle/src/main/res/layout/activity_main.xml
@@ -1,17 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ /*
-  ~  * Copyright (c) Microsoft Corporation. All rights reserved.
-  ~  * Licensed under the MIT License.
-  ~  */
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
   -->
 
-<com.microsoft.device.dualscreen.layout.SurfaceDuoLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.microsoft.device.dualscreen.layouts.SurfaceDuoLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:show_in_dual_screen_start="@layout/fragment_single_screen"
     app:show_in_dual_screen_end="@layout/fragment_dual_screen"
+    app:show_in_dual_screen_start="@layout/fragment_single_screen"
     app:show_in_single_screen="@layout/fragment_single_screen"
-    app:tools_screen_mode="dual_screen"/>
\ No newline at end of file
+    app:tools_screen_mode="dual_screen" />
\ No newline at end of file
diff --git a/HingeAngle/src/main/res/layout/fragment_dual_screen.xml b/HingeAngle/src/main/res/layout/fragment_dual_screen.xml
index adc57fa2..225bf8da 100644
--- a/HingeAngle/src/main/res/layout/fragment_dual_screen.xml
+++ b/HingeAngle/src/main/res/layout/fragment_dual_screen.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ /*
-  ~  * Copyright (c) Microsoft Corporation. All rights reserved.
-  ~  * Licensed under the MIT License.
-  ~  */
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/HingeAngle/src/main/res/layout/fragment_single_screen.xml b/HingeAngle/src/main/res/layout/fragment_single_screen.xml
index 13005fc2..817c0706 100644
--- a/HingeAngle/src/main/res/layout/fragment_single_screen.xml
+++ b/HingeAngle/src/main/res/layout/fragment_single_screen.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ /*
-  ~  * Copyright (c) Microsoft Corporation. All rights reserved.
-  ~  * Licensed under the MIT License.
-  ~  */
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/HingeAngle/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/HingeAngle/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 09902b3d..da870be2 100644
--- a/HingeAngle/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/HingeAngle/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ /*
-  ~  * Copyright (c) Microsoft Corporation. All rights reserved.
-  ~  * Licensed under the MIT License.
-  ~  */
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
   -->
 
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/HingeAngle/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/HingeAngle/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 09902b3d..da870be2 100644
--- a/HingeAngle/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/HingeAngle/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ /*
-  ~  * Copyright (c) Microsoft Corporation. All rights reserved.
-  ~  * Licensed under the MIT License.
-  ~  */
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
   -->
 
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/HingeAngle/src/main/res/values/attrs_pen_draw_view.xml b/HingeAngle/src/main/res/values/attrs_pen_draw_view.xml
index fcf1925a..d7382cb4 100644
--- a/HingeAngle/src/main/res/values/attrs_pen_draw_view.xml
+++ b/HingeAngle/src/main/res/values/attrs_pen_draw_view.xml
@@ -1,8 +1,5 @@
 <!--
-  ~ /*
-  ~  * Copyright (c) Microsoft Corporation. All rights reserved.
-  ~  * Licensed under the MIT License.
-  ~  */
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
   -->
 
 <resources>
diff --git a/HingeAngle/src/main/res/values/colors.xml b/HingeAngle/src/main/res/values/colors.xml
index 181624e7..d6d90dfc 100644
--- a/HingeAngle/src/main/res/values/colors.xml
+++ b/HingeAngle/src/main/res/values/colors.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ /*
-  ~  * Copyright (c) Microsoft Corporation. All rights reserved.
-  ~  * Licensed under the MIT License.
-  ~  */
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
   -->
 
 <resources>
diff --git a/HingeAngle/src/main/res/values/strings.xml b/HingeAngle/src/main/res/values/strings.xml
index d3da7fff..a4501808 100644
--- a/HingeAngle/src/main/res/values/strings.xml
+++ b/HingeAngle/src/main/res/values/strings.xml
@@ -1,8 +1,5 @@
 <!--
-  ~ /*
-  ~  * Copyright (c) Microsoft Corporation. All rights reserved.
-  ~  * Licensed under the MIT License.
-  ~  */
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
   -->
 
 <resources>
diff --git a/HingeAngle/src/main/res/values/styles.xml b/HingeAngle/src/main/res/values/styles.xml
index 9a8df0b2..5f6f145b 100644
--- a/HingeAngle/src/main/res/values/styles.xml
+++ b/HingeAngle/src/main/res/values/styles.xml
@@ -1,8 +1,5 @@
 <!--
-  ~ /*
-  ~  * Copyright (c) Microsoft Corporation. All rights reserved.
-  ~  * Licensed under the MIT License.
-  ~  */
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.Licensed under the MIT License.
   -->
 
 <resources>
diff --git a/ListDetail/build.gradle b/ListDetail/build.gradle
index cb61f041..3c14fbc1 100644
--- a/ListDetail/build.gradle
+++ b/ListDetail/build.gradle
@@ -23,6 +23,10 @@ android {
 }
 
 dependencies {
+    implementation microsoftDependencies.screenManager
+    implementation microsoftDependencies.layouts
+    implementation microsoftDependencies.fragmentsHandler
+
     implementation kotlinDependencies.kotlinStdlib
     implementation androidxDependencies.appCompat
     implementation androidxDependencies.constraintLayout
@@ -30,14 +34,11 @@ dependencies {
     implementation androidxDependencies.ktxFragment
     implementation androidxDependencies.recyclerView
 
-//    TODO: temporary change, will be updated in the next PR
-//    implementation microsoftDependencies.dualScreenLayout
-    implementation "com.microsoft.device.dualscreen:layouts:1.0.0-alpha02"
-
     testImplementation testDependencies.junit
 
     androidTestImplementation instrumentationTestDependencies.junit
     androidTestImplementation instrumentationTestDependencies.espressoCore
+    androidTestImplementation instrumentationTestDependencies.espressoContrib
     androidTestImplementation instrumentationTestDependencies.uiAutomator
     androidTestImplementation instrumentationTestDependencies.testRules
 }
diff --git a/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/ListDetailsInDualScreenModeTest.kt b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/ListDetailsInDualScreenModeTest.kt
new file mode 100644
index 00000000..75498fbf
--- /dev/null
+++ b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/ListDetailsInDualScreenModeTest.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
+package com.microsoft.device.display.samples.listdetail
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import androidx.test.rule.ActivityTestRule
+import com.microsoft.device.display.samples.listdetail.utils.forceClick
+import com.microsoft.device.display.samples.listdetail.utils.hasDrawable
+import com.microsoft.device.display.samples.listdetail.utils.setOrientationLeft
+import com.microsoft.device.display.samples.listdetail.utils.setOrientationRight
+import com.microsoft.device.display.samples.listdetail.utils.switchFromSingleToDualScreen
+import com.microsoft.device.display.samples.listdetail.utils.unfreezeRotation
+import org.junit.After
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class ListDetailsInDualScreenModeTest {
+    @get:Rule
+    val activityRule = ActivityTestRule<MainActivity>(MainActivity::class.java)
+
+    @After
+    fun tearDown() {
+        unfreezeRotation()
+    }
+
+    @Test
+    fun displayListAndDetails() {
+        switchFromSingleToDualScreen()
+
+        onView(withId(R.id.first_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.image_list)).check(matches(isDisplayed()))
+
+        onView(withId(R.id.image_list)).perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(2, forceClick()))
+        onView(withId(R.id.imageView)).check(matches(isDisplayed())).check(matches(hasDrawable(R.drawable.image_3)))
+    }
+
+    @Test
+    fun displayListAndDetailsWithRotationLeft() {
+        setOrientationLeft()
+        displayListAndDetails()
+    }
+
+    @Test
+    fun displayListAndDetailsWithRotationRight() {
+        setOrientationRight()
+        displayListAndDetails()
+    }
+}
\ No newline at end of file
diff --git a/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/ListDetailsInSingleScreenModeTest.kt b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/ListDetailsInSingleScreenModeTest.kt
new file mode 100644
index 00000000..b7789a44
--- /dev/null
+++ b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/ListDetailsInSingleScreenModeTest.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
+package com.microsoft.device.display.samples.listdetail
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import androidx.test.rule.ActivityTestRule
+import com.microsoft.device.display.samples.listdetail.utils.forceClick
+import com.microsoft.device.display.samples.listdetail.utils.hasDrawable
+import com.microsoft.device.display.samples.listdetail.utils.setOrientationLeft
+import com.microsoft.device.display.samples.listdetail.utils.unfreezeRotation
+import org.junit.After
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class ListDetailsInSingleScreenModeTest {
+    @get:Rule
+    val activityRule = ActivityTestRule<MainActivity>(MainActivity::class.java)
+
+    @After
+    fun tearDown() {
+        unfreezeRotation()
+    }
+
+    @Test
+    fun openDetailsFromList() {
+        onView(withId(R.id.first_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.image_list)).check(matches(isDisplayed()))
+
+        onView(withId(R.id.image_list)).perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(1, forceClick()))
+        onView(withId(R.id.imageView)).check(matches(isDisplayed())).check(matches(hasDrawable(R.drawable.image_2)))
+    }
+
+    @Test
+    fun openDetailsFromListWithRotationLeft() {
+        setOrientationLeft()
+        openDetailsFromList()
+    }
+
+    @Test
+    fun openDetailsFromListWithRotationRight() {
+        setOrientationLeft()
+        openDetailsFromList()
+    }
+}
diff --git a/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/ListDetailsSwitchScreenModeTest.kt b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/ListDetailsSwitchScreenModeTest.kt
new file mode 100644
index 00000000..cec6edf8
--- /dev/null
+++ b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/ListDetailsSwitchScreenModeTest.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
+package com.microsoft.device.display.samples.listdetail
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import androidx.test.rule.ActivityTestRule
+import com.microsoft.device.display.samples.listdetail.utils.forceClick
+import com.microsoft.device.display.samples.listdetail.utils.hasDrawable
+import com.microsoft.device.display.samples.listdetail.utils.setOrientationLeft
+import com.microsoft.device.display.samples.listdetail.utils.setOrientationRight
+import com.microsoft.device.display.samples.listdetail.utils.switchFromDualToSingleScreen
+import com.microsoft.device.display.samples.listdetail.utils.switchFromSingleToDualScreen
+import com.microsoft.device.display.samples.listdetail.utils.unfreezeRotation
+import org.junit.After
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class ListDetailsSwitchScreenModeTest {
+    @get:Rule
+    val activityRule = ActivityTestRule<MainActivity>(MainActivity::class.java)
+
+    @After
+    fun tearDown() {
+        unfreezeRotation()
+    }
+
+    @Test
+    fun testSwitchScreenMode() {
+        checkInSingleScreenMode()
+        switchFromSingleToDualScreen()
+        checkInDualScreenMode()
+        switchFromDualToSingleScreen()
+        checkInSingleScreenMode()
+    }
+
+    @Test
+    fun testSwitchScreenModeWithOrientationLeft() {
+        setOrientationLeft()
+        checkInSingleScreenMode()
+        switchFromSingleToDualScreen()
+        checkInSingleScreenMode()
+        switchFromDualToSingleScreen()
+        checkInSingleScreenMode()
+    }
+
+    @Test
+    fun testSwitchScreenModeWithOrientationRight() {
+        setOrientationRight()
+        checkInSingleScreenMode()
+        switchFromSingleToDualScreen()
+        checkInSingleScreenMode()
+        switchFromDualToSingleScreen()
+        checkInSingleScreenMode()
+    }
+
+    private fun checkInSingleScreenMode() {
+        onView(withId(R.id.first_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.image_list)).check(matches(isDisplayed()))
+
+        onView(withId(R.id.image_list)).perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(1, forceClick()))
+        onView(withId(R.id.imageView)).check(matches(isDisplayed())).check(matches(hasDrawable(R.drawable.image_2)))
+    }
+
+    private fun checkInDualScreenMode() {
+        onView(withId(R.id.first_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.second_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.image_list)).check(matches(isDisplayed()))
+
+        onView(withId(R.id.image_list)).perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(2, forceClick()))
+        onView(withId(R.id.imageView)).check(matches(isDisplayed())).check(matches(hasDrawable(R.drawable.image_3)))
+    }
+}
\ No newline at end of file
diff --git a/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/ListDetailsTest.kt b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/ListDetailsTest.kt
deleted file mode 100644
index dbc49b52..00000000
--- a/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/ListDetailsTest.kt
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- *
- */
-
-package com.microsoft.device.display.samples.listdetail
-
-import android.view.View
-import android.widget.ListView
-import androidx.test.espresso.Espresso.onData
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.BoundedMatcher
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.ActivityTestRule
-import androidx.test.uiautomator.UiDevice
-import org.hamcrest.Description
-import org.hamcrest.Matcher
-import org.hamcrest.Matchers.hasToString
-import org.hamcrest.core.AllOf.allOf
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
-class ListDetailsTest {
-    private val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-
-    @get:Rule
-    val activityRule = ActivityTestRule<MainActivity>(MainActivity::class.java)
-
-    @Test
-    fun openDetailsFromList_whenInSingleMode() {
-        onView(withId(R.id.single_screen_container_id)).check(matches(isDisplayed()))
-        onView(withId(R.id.list_view)).check(matches(isDisplayed()))
-
-        onData(hasToString("Item 2"))
-            .inAdapterView(withId(R.id.list_view))
-            .perform(click())
-
-        onView(allOf(withId(R.id.tvTitle), withText("Item 2"))).check(matches(isDisplayed()))
-    }
-
-    @Test
-    fun displayListAndDetails_whenInDualMode() {
-        spanApplication()
-
-        onView(withId(R.id.dual_screen_start_container_id)).check(matches(isDisplayed()))
-        onView(withId(R.id.dual_screen_end_container_id)).check(matches(isDisplayed()))
-
-        onView(withId(R.id.list_view)).check(matches(isDisplayed()))
-        onView(withId(R.id.tvTitle)).check(matches(isDisplayed()))
-    }
-
-    @Test
-    fun checkLinkBetweenListAndDetail_whenInDualMode() {
-        spanApplication()
-
-        onView(withId(R.id.list_view)).check(matches(isDisplayed()))
-
-        onData(hasToString("Item 2"))
-            .inAdapterView(withId(R.id.list_view))
-            .perform(click())
-
-        onView(withId(R.id.list_view)).check(matches(isItemChecked(1)))
-        onView(allOf(withId(R.id.tvTitle), withText("Item 2"))).check(matches(isDisplayed()))
-    }
-
-    private fun spanApplication() {
-        device.swipe(675, 1780, 1350, 900, 400)
-    }
-
-    companion object {
-        fun isItemChecked(itemPosition: Int): Matcher<View> =
-            object : BoundedMatcher<View, ListView>(ListView::class.java) {
-                override fun describeTo(description: Description?) {
-                    description?.appendText(
-                        "Check if item from position $itemPosition is checked"
-                    )
-                }
-
-                override fun matchesSafely(listView: ListView?): Boolean {
-                    return listView?.isItemChecked(itemPosition) == true
-                }
-            }
-    }
-}
diff --git a/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/utils/DrawableMatcher.kt b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/utils/DrawableMatcher.kt
new file mode 100644
index 00000000..c06904c7
--- /dev/null
+++ b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/utils/DrawableMatcher.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
+package com.microsoft.device.display.samples.listdetail.utils
+
+import android.graphics.drawable.BitmapDrawable
+import android.view.View
+import android.widget.ImageView
+import androidx.core.content.ContextCompat
+import org.hamcrest.Description
+import org.hamcrest.TypeSafeMatcher
+
+/**
+ * A matcher that matches {@link ImageView}s based on its drawable background id.
+ */
+class DrawableMatcher(private val drawableId: Int) : TypeSafeMatcher<View?>(View::class.java) {
+    private var resourceName: String? = null
+
+    override fun matchesSafely(target: View?): Boolean {
+        if (target == null) {
+            return false
+        }
+
+        if (target !is ImageView) {
+            return false
+        }
+
+        if (drawableId < 0) {
+            return target.drawable == null
+        }
+
+        resourceName = target.getContext().resources.getResourceEntryName(drawableId)
+
+        val expectedDrawable = ContextCompat.getDrawable(target.context, drawableId) ?: return false
+        val targetBitmap = (target.drawable as BitmapDrawable).bitmap
+        val expectedBitmap = (expectedDrawable as BitmapDrawable).bitmap
+        return targetBitmap.sameAs(expectedBitmap)
+    }
+
+    override fun describeTo(description: Description) {
+        description.appendText("with drawable from resource id: ")
+        description.appendValue(drawableId)
+        resourceName?.let {
+            description.appendText("[")
+            description.appendText(it)
+            description.appendText("]")
+        }
+    }
+}
\ No newline at end of file
diff --git a/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/utils/ForceClick.kt b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/utils/ForceClick.kt
new file mode 100644
index 00000000..a584a6f0
--- /dev/null
+++ b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/utils/ForceClick.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
+package com.microsoft.device.display.samples.listdetail.utils
+
+import android.view.View
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.matcher.ViewMatchers.isClickable
+import androidx.test.espresso.matcher.ViewMatchers.isEnabled
+import org.hamcrest.Matcher
+import org.hamcrest.Matchers.allOf
+
+/**
+ * Click action for a view without to check the coordinates for the view on the screen. when device is rotated.
+ */
+class ForceClick : ViewAction {
+    override fun getConstraints(): Matcher<View> {
+        return allOf(isClickable(), isEnabled())
+    }
+
+    override fun getDescription(): String {
+        return "force click"
+    }
+
+    override fun perform(uiController: UiController?, view: View?) {
+        view?.performClick()
+        uiController?.loopMainThreadUntilIdle()
+    }
+}
\ No newline at end of file
diff --git a/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/utils/SurfaceDuoUtils.kt b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/utils/SurfaceDuoUtils.kt
new file mode 100644
index 00000000..ace27279
--- /dev/null
+++ b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/utils/SurfaceDuoUtils.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+package com.microsoft.device.display.samples.listdetail.utils
+
+import android.graphics.Rect
+import android.view.Surface
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
+
+val START_SCREEN_RECT = Rect(0, 0, 1350, 1800)
+val END_SCREEN_RECT = Rect(1434, 0, 2784, 1800)
+
+val SINGLE_SCREEN_WINDOW_RECT = START_SCREEN_RECT
+val DUAL_SCREEN_WINDOW_RECT = Rect(0, 0, 2784, 1800)
+
+val SINGLE_SCREEN_HINGE_RECT = Rect()
+val DUAL_SCREEN_HINGE_RECT = Rect(1350, 0, 1434, 1800)
+
+/**
+ * Switches application from single screen mode to dual screen mode
+ */
+fun switchFromSingleToDualScreen() {
+    val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    when (device.displayRotation) {
+        Surface.ROTATION_0 -> device.swipe(675, 1780, 1350, 900, 400)
+        Surface.ROTATION_270 -> device.swipe(1780, 675, 900, 1350, 400)
+        Surface.ROTATION_90 -> device.swipe(1780, 2109, 900, 1400, 400)
+    }
+}
+
+/**
+ * Switches application from dual screen mode to single screen
+ */
+fun switchFromDualToSingleScreen() {
+    val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    when (device.displayRotation) {
+        Surface.ROTATION_0 -> device.swipe(1500, 1780, 650, 900, 400)
+        Surface.ROTATION_270 -> device.swipe(1780, 1500, 900, 650, 400)
+        Surface.ROTATION_90 -> device.swipe(1780, 1250, 900, 1500, 400)
+    }
+}
+
+/**
+ * Re-enables the sensors and un-freezes the device rotation allowing its contents
+ * to rotate with the device physical rotation. During a test execution, it is best to
+ * keep the device frozen in a specific orientation until the test case execution has completed.
+ */
+fun unfreezeRotation() {
+    val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    device.unfreezeRotation()
+}
+
+/**
+ * Simulates orienting the device to the left and also freezes rotation
+ * by disabling the sensors.
+ */
+fun setOrientationLeft() {
+    val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    device.setOrientationLeft()
+}
+
+/**
+ * Simulates orienting the device into its natural orientation and also freezes rotation
+ * by disabling the sensors.
+ */
+fun setOrientationNatural() {
+    val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    device.setOrientationNatural()
+}
+
+/**
+ * Simulates orienting the device to the right and also freezes rotation
+ * by disabling the sensors.
+ */
+fun setOrientationRight() {
+    val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    device.setOrientationRight()
+}
\ No newline at end of file
diff --git a/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/utils/TestUtils.kt b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/utils/TestUtils.kt
new file mode 100644
index 00000000..56764e9f
--- /dev/null
+++ b/ListDetail/src/androidTest/java/com/microsoft/device/display/samples/listdetail/utils/TestUtils.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
+package com.microsoft.device.display.samples.listdetail.utils
+
+import androidx.test.espresso.ViewAction
+
+/**
+ * Returns an action that clicks the view without to check the coordinates on the screen.
+ * Seems that ViewActions.click() finds coordinates of the view on the screen, and then performs the tap on the coordinates.
+ * Seems tha changing the screen rotations affects these coordinates and ViewActions.click() throws exceptions.
+ */
+fun forceClick(): ViewAction = ForceClick()
+
+/**
+ * Returns a matcher that matches {@link ImageViews Views} that has the expected drawable background.
+ * @param drawableId The expected Drawable resource id
+ */
+fun hasDrawable(drawableId: Int) = DrawableMatcher(drawableId)
\ No newline at end of file
diff --git a/ListDetail/src/main/AndroidManifest.xml b/ListDetail/src/main/AndroidManifest.xml
index 742b875a..68746b4c 100644
--- a/ListDetail/src/main/AndroidManifest.xml
+++ b/ListDetail/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) Microsoft Corporation. All rights reserved.
   ~ Licensed under the MIT License.
   ~
@@ -10,6 +9,7 @@
     package="com.microsoft.device.display.samples.listdetail">
 
     <application
+        android:name=".ListDetailApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/ItemDetailFragment.kt b/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/ItemDetailFragment.kt
index 191037f2..cf6672db 100644
--- a/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/ItemDetailFragment.kt
+++ b/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/ItemDetailFragment.kt
@@ -16,30 +16,16 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import com.microsoft.device.display.samples.listdetail.model.SelectionViewModel
-import com.microsoft.device.dualscreen.core.ScreenHelper
-
-class ItemDetailFragment : Fragment() {
+import com.microsoft.device.dualscreen.ScreenInfo
+import com.microsoft.device.dualscreen.ScreenInfoListener
+import com.microsoft.device.dualscreen.ScreenManagerProvider
 
+class ItemDetailFragment : Fragment(), ScreenInfoListener {
     private lateinit var imageView: ImageView
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val view = inflater.inflate(
-            R.layout.fragment_item_detail,
-            container,
-            false
-        )
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val view = inflater.inflate(R.layout.fragment_item_detail, container, false)
         imageView = view.findViewById(R.id.imageView)
-
-        if (!ScreenHelper.isDualMode(requireActivity())) {
-            val toolbar = view.findViewById<Toolbar>(R.id.detail_toolbar)
-            toolbar.setNavigationIcon(R.drawable.ic_arrow_back)
-            toolbar.setNavigationOnClickListener { closeFragment() }
-        }
-
         return view
     }
 
@@ -55,13 +41,28 @@ class ItemDetailFragment : Fragment() {
         )
     }
 
+    override fun onResume() {
+        super.onResume()
+        ScreenManagerProvider.getScreenManager().addScreenInfoListener(this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        ScreenManagerProvider.getScreenManager().removeScreenInfoListener(this)
+    }
+
+    override fun onScreenInfoChanged(screenInfo: ScreenInfo) {
+        if (!screenInfo.isDualMode()) {
+            val toolbar = requireView().findViewById<Toolbar>(R.id.detail_toolbar)
+            toolbar.setNavigationIcon(R.drawable.ic_arrow_back)
+            toolbar.setNavigationOnClickListener { closeFragment() }
+        }
+    }
+
     private fun closeFragment() {
         parentFragmentManager.beginTransaction()
-            .replace(
-                R.id.first_container_id,
-                ItemsListFragment(),
-                null
-            ).addToBackStack(null)
+            .replace(R.id.first_container_id, ItemsListFragment(), null)
+            .addToBackStack(null)
             .commit()
     }
 }
diff --git a/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/ItemsListFragment.kt b/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/ItemsListFragment.kt
index 01459115..c875bdef 100644
--- a/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/ItemsListFragment.kt
+++ b/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/ItemsListFragment.kt
@@ -14,32 +14,28 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
+import com.microsoft.device.display.samples.listdetail.extensions.isInPortrait
 import com.microsoft.device.display.samples.listdetail.model.DataProvider
 import com.microsoft.device.display.samples.listdetail.model.ImageAdapter
 import com.microsoft.device.display.samples.listdetail.model.SelectionViewModel
-import com.microsoft.device.dualscreen.core.ScreenHelper
+import com.microsoft.device.dualscreen.ScreenInfo
+import com.microsoft.device.dualscreen.ScreenInfoListener
+import com.microsoft.device.dualscreen.ScreenManagerProvider
 
-class ItemsListFragment : Fragment() {
+class ItemsListFragment : Fragment(), ScreenInfoListener {
     private var imageAdapter: ImageAdapter? = null
     private lateinit var images: ArrayList<Int>
+    private var screenInfo: ScreenInfo? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         images = DataProvider.imageIDs
         activity?.let {
-            imageAdapter = ImageAdapter(
-                it,
-                images,
-                ::onItemClick
-            )
+            imageAdapter = ImageAdapter(it, images, ::onItemClick)
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val view = inflater.inflate(R.layout.fragment_items_list, container, false)
         val recyclerView = view.findViewById<RecyclerView>(R.id.image_list)
 
@@ -55,21 +51,33 @@ class ItemsListFragment : Fragment() {
         val viewModel = ViewModelProvider(requireActivity()).get(SelectionViewModel::class.java)
         viewModel.setSelectedItemLiveData(item)
 
-        if (ScreenHelper.isDualMode(requireActivity()) && !MainActivity.isPortrait(requireActivity())) {
-            parentFragmentManager.beginTransaction()
-                .replace(
-                    R.id.second_container_id,
-                    ItemDetailFragment(),
-                    null
-                ).commit()
-        } else {
-            parentFragmentManager.beginTransaction()
-                .replace(
-                    R.id.first_container_id,
-                    ItemDetailFragment(),
-                    null
-                ).addToBackStack(null)
-                .commit()
+        screenInfo?.let {
+            if (it.isDualMode() && !it.isInPortrait) {
+                parentFragmentManager
+                    .beginTransaction()
+                    .replace(R.id.second_container_id, ItemDetailFragment(), null)
+                    .commit()
+            } else {
+                parentFragmentManager
+                    .beginTransaction()
+                    .replace(R.id.first_container_id, ItemDetailFragment(), null)
+                    .addToBackStack(null)
+                    .commit()
+            }
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        ScreenManagerProvider.getScreenManager().addScreenInfoListener(this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        ScreenManagerProvider.getScreenManager().removeScreenInfoListener(this)
+    }
+
+    override fun onScreenInfoChanged(screenInfo: ScreenInfo) {
+        this.screenInfo = screenInfo
+    }
 }
\ No newline at end of file
diff --git a/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/ListDetailApplication.kt b/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/ListDetailApplication.kt
new file mode 100644
index 00000000..39c1a52f
--- /dev/null
+++ b/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/ListDetailApplication.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
+package com.microsoft.device.display.samples.listdetail
+
+import android.app.Application
+import com.microsoft.device.dualscreen.ScreenManagerProvider
+import com.microsoft.device.dualscreen.fragmentshandler.FragmentManagerStateHandler
+
+class ListDetailApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        ScreenManagerProvider.init(this)
+        FragmentManagerStateHandler.init(this)
+    }
+}
\ No newline at end of file
diff --git a/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/MainActivity.kt b/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/MainActivity.kt
index 37e2ab25..3a1b9601 100644
--- a/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/MainActivity.kt
+++ b/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/MainActivity.kt
@@ -6,55 +6,56 @@
 
 package com.microsoft.device.display.samples.listdetail
 
-import android.content.Context
 import android.os.Bundle
-import android.view.Surface
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
+import com.microsoft.device.display.samples.listdetail.extensions.isInPortrait
 import com.microsoft.device.display.samples.listdetail.model.SelectionViewModel
-import com.microsoft.device.dualscreen.core.ScreenHelper
-
-class MainActivity : AppCompatActivity() {
-    companion object {
-        fun isPortrait(context: Context): Boolean {
-            return ScreenHelper.getCurrentRotation(context) == Surface.ROTATION_90 ||
-                ScreenHelper.getCurrentRotation(context) == Surface.ROTATION_270
-        }
-    }
+import com.microsoft.device.dualscreen.ScreenInfo
+import com.microsoft.device.dualscreen.ScreenInfoListener
+import com.microsoft.device.dualscreen.ScreenManagerProvider
 
+class MainActivity : AppCompatActivity(), ScreenInfoListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        if (ScreenHelper.isDualMode(this) && !isPortrait(applicationContext)) {
+        // set the first image as the default selection if none is selected
+        val viewModel = ViewModelProvider(this).get(SelectionViewModel::class.java)
+        if (viewModel.getSelectedItemLiveData().value == 0) {
+            viewModel.setSelectedItemLiveData(R.drawable.image_1)
+        }
+    }
+
+    override fun onScreenInfoChanged(screenInfo: ScreenInfo) {
+        setupLayout(screenInfo)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        ScreenManagerProvider.getScreenManager().addScreenInfoListener(this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        ScreenManagerProvider.getScreenManager().removeScreenInfoListener(this)
+    }
+
+    private fun setupLayout(screenInfo: ScreenInfo) {
+        if (screenInfo.isDualMode() && !screenInfo.isInPortrait) {
             supportFragmentManager
                 .beginTransaction()
-                .replace(
-                    R.id.first_container_id,
-                    ItemsListFragment(),
-                    null
-                ).commit()
+                .replace(R.id.first_container_id, ItemsListFragment(), null)
+                .commit()
             supportFragmentManager
                 .beginTransaction()
-                .replace(
-                    R.id.second_container_id,
-                    ItemDetailFragment()
-                ).commit()
+                .replace(R.id.second_container_id, ItemDetailFragment(), null)
+                .commit()
         } else {
             supportFragmentManager
                 .beginTransaction()
-                .replace(
-                    R.id.first_container_id,
-                    ItemsListFragment(),
-                    null
-                )
+                .replace(R.id.first_container_id, ItemsListFragment(), null)
                 .commit()
         }
-
-        // set the first image as the default selection if none is selected
-        val viewModel = ViewModelProvider(this).get(SelectionViewModel::class.java)
-        if (viewModel.getSelectedItemLiveData().value == 0) {
-            viewModel.setSelectedItemLiveData(R.drawable.image_1)
-        }
     }
 }
\ No newline at end of file
diff --git a/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/extensions/ScreenInfo.kt b/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/extensions/ScreenInfo.kt
new file mode 100644
index 00000000..1174ec81
--- /dev/null
+++ b/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/extensions/ScreenInfo.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
+package com.microsoft.device.display.samples.listdetail.extensions
+
+import android.view.Surface
+import com.microsoft.device.dualscreen.ScreenInfo
+
+val ScreenInfo.isInPortrait: Boolean
+    get() = getScreenRotation() == Surface.ROTATION_90 ||
+        getScreenRotation() == Surface.ROTATION_270
\ No newline at end of file
diff --git a/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/model/ImageAdapter.kt b/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/model/ImageAdapter.kt
index b4b12ee0..33fe12d5 100644
--- a/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/model/ImageAdapter.kt
+++ b/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/model/ImageAdapter.kt
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
 package com.microsoft.device.display.samples.listdetail.model
 
 import android.content.Context
diff --git a/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/model/SelectionViewModel.kt b/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/model/SelectionViewModel.kt
index 5aaa5d6e..1771eede 100644
--- a/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/model/SelectionViewModel.kt
+++ b/ListDetail/src/main/java/com/microsoft/device/display/samples/listdetail/model/SelectionViewModel.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
 package com.microsoft.device.display.samples.listdetail.model
 
 import androidx.lifecycle.LiveData
diff --git a/TwoPage/build.gradle b/TwoPage/build.gradle
index 9cfe9744..e5fb39e9 100644
--- a/TwoPage/build.gradle
+++ b/TwoPage/build.gradle
@@ -24,14 +24,15 @@ android {
 }
 
 dependencies {
+    implementation microsoftDependencies.screenManager
+    implementation microsoftDependencies.layouts
+
     implementation kotlinDependencies.kotlinStdlib
     implementation androidxDependencies.appCompat
     implementation androidxDependencies.constraintLayout
     implementation androidxDependencies.ktxCore
     implementation androidxDependencies.ktxFragment
 
-    implementation microsoftDependencies.dualScreenLayout
-
     testImplementation testDependencies.junit
 
     androidTestImplementation instrumentationTestDependencies.junit
diff --git a/TwoPage/src/androidTest/java/com/microsoft/device/display/samples/twopage/TwoPageModeOrientationTest.kt b/TwoPage/src/androidTest/java/com/microsoft/device/display/samples/twopage/TwoPageModeOrientationTest.kt
index 9e016356..1e836987 100644
--- a/TwoPage/src/androidTest/java/com/microsoft/device/display/samples/twopage/TwoPageModeOrientationTest.kt
+++ b/TwoPage/src/androidTest/java/com/microsoft/device/display/samples/twopage/TwoPageModeOrientationTest.kt
@@ -7,6 +7,8 @@
 package com.microsoft.device.display.samples.twopage
 
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.action.ViewActions.swipeLeft
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -18,6 +20,7 @@ import androidx.test.rule.ActivityTestRule
 import androidx.test.uiautomator.UiDevice
 import org.hamcrest.core.AllOf.allOf
 import org.junit.After
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -29,20 +32,28 @@ class TwoPageModeOrientationTest {
 
     @get:Rule
     val activityRule = ActivityTestRule<MainActivity>(MainActivity::class.java)
+    private lateinit var idlingResource: ViewPagerIdlingResource
+
+    @Before
+    fun setup() {
+        idlingResource = ViewPagerIdlingResource(activityRule.activity.findViewById(R.id.pager))
+        IdlingRegistry.getInstance().register(idlingResource)
+    }
 
     @After
     fun resetOrientation() {
+        IdlingRegistry.getInstance().unregister(idlingResource)
         device.setOrientationNatural()
         device.unfreezeRotation()
     }
 
     @Test
     fun displayLayouts_whenInSingleScreenPortrait() {
-        onView(withId(R.id.single_pager_container)).check(matches(isDisplayed()))
+        onView(withId(R.id.pager)).check(matches(isDisplayed()))
         onView(allOf(withId(R.id.app_name_text), withText("Two Page")))
             .check(matches(isDisplayed()))
 
-        changePagePortrait()
+        onView(withId(R.id.pager)).perform(swipeLeft())
 
         onView(allOf(withId(R.id.page2_page_number), withText("PAGE 2 of 4")))
             .check(matches(isDisplayed()))
@@ -52,20 +63,20 @@ class TwoPageModeOrientationTest {
     fun displayLayouts_whenInDualScreenPortrait() {
         spanApplication()
 
-        onView(withId(R.id.single_pager_container)).check(matches(isDisplayed()))
+        onView(withId(R.id.pager)).check(matches(isDisplayed()))
         onView(allOf(withId(R.id.app_name_text), withText("Two Page")))
             .check(matches(isDisplayed()))
         onView(allOf(withId(R.id.page2_page_number), withText("PAGE 2 of 4")))
             .check(matches(isDisplayed()))
 
-        changePagePortrait()
+        onView(withId(R.id.pager)).perform(swipeLeft())
 
         onView(allOf(withId(R.id.page2_page_number), withText("PAGE 2 of 4")))
             .check(matches(isDisplayed()))
         onView(allOf(withId(R.id.page3_page_number), withText("PAGE 3 of 4")))
             .check(matches(isDisplayed()))
 
-        changeTwoPagesPortrait()
+        onView(withId(R.id.pager)).perform(swipeLeft())
 
         onView(allOf(withId(R.id.page3_page_number), withText("PAGE 3 of 4")))
             .check(matches(isDisplayed()))
@@ -77,7 +88,7 @@ class TwoPageModeOrientationTest {
     fun displayLayouts_whenInSingleScreenLandscape() {
         rotateDevice()
 
-        onView(withId(R.id.single_pager_container)).check(matches(isDisplayed()))
+        onView(withId(R.id.pager)).check(matches(isDisplayed()))
         onView(allOf(withId(R.id.app_name_text), withText("Two Page")))
             .check(matches(isDisplayed()))
 
@@ -92,7 +103,7 @@ class TwoPageModeOrientationTest {
         rotateDevice()
         spanLandscapeApplication()
 
-        onView(withId(R.id.dual_pager_container)).check(matches(isDisplayed()))
+        onView(withId(R.id.pager)).check(matches(isDisplayed()))
         onView(allOf(withId(R.id.app_name_text), withText("Two Page")))
             .check(matches(isDisplayed()))
 
@@ -114,14 +125,6 @@ class TwoPageModeOrientationTest {
         device.setOrientationLeft()
     }
 
-    private fun changePagePortrait() {
-        device.swipe(1000, 1000, 200, 1000, 10)
-    }
-
-    private fun changeTwoPagesPortrait() {
-        device.swipe(2500, 1000, 200, 1000, 10)
-    }
-
     private fun changePageLandscape() {
         device.swipe(1500, 2000, 200, 2000, 10)
     }
diff --git a/TwoPage/src/androidTest/java/com/microsoft/device/display/samples/twopage/ViewPagerIdlingResource.kt b/TwoPage/src/androidTest/java/com/microsoft/device/display/samples/twopage/ViewPagerIdlingResource.kt
new file mode 100644
index 00000000..c240f7c0
--- /dev/null
+++ b/TwoPage/src/androidTest/java/com/microsoft/device/display/samples/twopage/ViewPagerIdlingResource.kt
@@ -0,0 +1,37 @@
+package com.microsoft.device.display.samples.twopage
+
+import androidx.test.espresso.IdlingResource
+import androidx.test.espresso.IdlingResource.ResourceCallback
+import androidx.viewpager.widget.ViewPager
+import androidx.viewpager.widget.ViewPager.SimpleOnPageChangeListener
+
+class ViewPagerIdlingResource(viewPager: ViewPager) : IdlingResource {
+    @Volatile
+    private var isIdle = true // Default to idle since we can't query the scroll state.
+    private var resourceCallback: ResourceCallback? = null
+
+    init {
+        viewPager.addOnPageChangeListener(ViewPagerListener())
+    }
+
+    override fun getName(): String {
+        return ViewPagerIdlingResource::class.java.simpleName
+    }
+
+    override fun isIdleNow(): Boolean {
+        return isIdle
+    }
+
+    override fun registerIdleTransitionCallback(resourceCallback: ResourceCallback) {
+        this.resourceCallback = resourceCallback
+    }
+
+    private inner class ViewPagerListener : SimpleOnPageChangeListener() {
+        override fun onPageScrollStateChanged(state: Int) {
+            isIdle = (state == ViewPager.SCROLL_STATE_IDLE || state == ViewPager.SCROLL_STATE_DRAGGING)
+            if (isIdle) {
+                resourceCallback?.onTransitionToIdle()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/TwoPage/src/main/AndroidManifest.xml b/TwoPage/src/main/AndroidManifest.xml
index bb2a1e17..d6747daf 100644
--- a/TwoPage/src/main/AndroidManifest.xml
+++ b/TwoPage/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) Microsoft Corporation. All rights reserved.
   ~ Licensed under the MIT License.
   ~
@@ -11,6 +10,7 @@
     tools:ignore="GoogleAppIndexingWarning">
 
     <application
+        android:name=".TwoPageApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -18,7 +18,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup">
-        <activity android:name=".MainActivity"
+        <activity
+            android:name=".MainActivity"
             android:configChanges="screenSize|screenLayout|orientation|smallestScreenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/TwoPage/src/main/java/com/microsoft/device/display/samples/twopage/MainActivity.kt b/TwoPage/src/main/java/com/microsoft/device/display/samples/twopage/MainActivity.kt
index 2a10506f..dcf769b0 100644
--- a/TwoPage/src/main/java/com/microsoft/device/display/samples/twopage/MainActivity.kt
+++ b/TwoPage/src/main/java/com/microsoft/device/display/samples/twopage/MainActivity.kt
@@ -10,7 +10,6 @@ import android.content.res.Configuration
 import android.os.Bundle
 import android.util.SparseArray
 import android.view.Surface
-import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.viewpager.widget.ViewPager
@@ -19,25 +18,45 @@ import com.microsoft.device.display.samples.twopage.fragments.FirstPageFragment
 import com.microsoft.device.display.samples.twopage.fragments.FourthPageFragment
 import com.microsoft.device.display.samples.twopage.fragments.SecondPageFragment
 import com.microsoft.device.display.samples.twopage.fragments.ThirdPageFragment
-import com.microsoft.device.dualscreen.layout.ScreenHelper
+import com.microsoft.device.dualscreen.ScreenInfo
+import com.microsoft.device.dualscreen.ScreenInfoListener
+import com.microsoft.device.dualscreen.ScreenManagerProvider
 
-class MainActivity : AppCompatActivity(), OnPageChangeListener {
+class MainActivity : AppCompatActivity(), OnPageChangeListener, ScreenInfoListener {
     private lateinit var viewPager: ViewPager
     private lateinit var pagerAdapter: PagerAdapter
     private var position = 0
     private var showTwoPages = false
-    private lateinit var single: View
-    private lateinit var dual: View
+
     @SuppressLint("InflateParams")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
 
         supportActionBar?.hide()
-
         setupPager()
-        single = layoutInflater.inflate(R.layout.activity_main, null)
-        dual = layoutInflater.inflate(R.layout.double_landscape_layout, null)
-        setupLayout()
+    }
+
+    override fun onScreenInfoChanged(screenInfo: ScreenInfo) {
+        showTwoPages = screenInfo.isDualMode() &&
+            screenInfo.getScreenRotation() != Surface.ROTATION_90 &&
+            screenInfo.getScreenRotation() != Surface.ROTATION_270
+        setupViewPager()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        ScreenManagerProvider.getScreenManager().addScreenInfoListener(this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        ScreenManagerProvider.getScreenManager().removeScreenInfoListener(this)
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        ScreenManagerProvider.getScreenManager().onConfigurationChanged()
     }
 
     private fun setupPager() {
@@ -49,37 +68,6 @@ class MainActivity : AppCompatActivity(), OnPageChangeListener {
         pagerAdapter = PagerAdapter(supportFragmentManager, fragments)
     }
 
-    private fun setupLayout() {
-        if (ScreenHelper.isDualMode(this)) {
-            useDualMode()
-        } else {
-            useSingleMode()
-        }
-    }
-
-    private fun useDualMode() {
-        val rotation = ScreenHelper.getCurrentRotation(this)
-        showTwoPages = when (rotation) {
-            Surface.ROTATION_90, Surface.ROTATION_270 -> {
-                // Setting layout for double landscape
-                setContentView(dual)
-                false
-            }
-            else -> {
-                // Setting layout for double portrait
-                setContentView(single)
-                true
-            }
-        }
-        setupViewPager()
-    }
-
-    private fun useSingleMode() { // Setting layout for single portrait
-        setContentView(single)
-        showTwoPages = false
-        setupViewPager()
-    }
-
     private fun setupViewPager() {
         pagerAdapter.showTwoPages(showTwoPages)
         if (::viewPager.isInitialized) {
@@ -92,11 +80,6 @@ class MainActivity : AppCompatActivity(), OnPageChangeListener {
         }
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        setupLayout()
-    }
-
     override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
 
     override fun onPageSelected(position: Int) {
diff --git a/TwoPage/src/main/java/com/microsoft/device/display/samples/twopage/TwoPageApplication.kt b/TwoPage/src/main/java/com/microsoft/device/display/samples/twopage/TwoPageApplication.kt
new file mode 100644
index 00000000..95743e92
--- /dev/null
+++ b/TwoPage/src/main/java/com/microsoft/device/display/samples/twopage/TwoPageApplication.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+package com.microsoft.device.display.samples.twopage
+
+import android.app.Application
+import com.microsoft.device.dualscreen.ScreenManagerProvider
+
+class TwoPageApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        ScreenManagerProvider.init(this)
+    }
+}
\ No newline at end of file
diff --git a/TwoPage/src/main/res/layout/activity_main.xml b/TwoPage/src/main/res/layout/activity_main.xml
index b5a718a2..857fe635 100644
--- a/TwoPage/src/main/res/layout/activity_main.xml
+++ b/TwoPage/src/main/res/layout/activity_main.xml
@@ -1,17 +1,16 @@
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) Microsoft Corporation. All rights reserved.
   ~ Licensed under the MIT License.
   ~
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/single_pager_container"
+<com.microsoft.device.dualscreen.layouts.SurfaceDuoLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</FrameLayout>
\ No newline at end of file
+    android:layout_height="match_parent"
+    app:is_dual_landscape_single_container="true"
+    app:is_dual_portrait_single_container="true"
+    app:dual_landscape_single_layout_id="@layout/double_landscape_layout"
+    app:dual_portrait_single_layout_id="@layout/single_screen_layout"
+    app:single_screen_layout_id="@layout/single_screen_layout"
+    app:tools_screen_mode="dual_screen" />
\ No newline at end of file
diff --git a/TwoPage/src/main/res/layout/double_landscape_layout.xml b/TwoPage/src/main/res/layout/double_landscape_layout.xml
index baa3ab3f..58fdda4d 100644
--- a/TwoPage/src/main/res/layout/double_landscape_layout.xml
+++ b/TwoPage/src/main/res/layout/double_landscape_layout.xml
@@ -1,16 +1,10 @@
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) Microsoft Corporation. All rights reserved.
   ~ Licensed under the MIT License.
   ~
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dual_pager_container"
+<com.microsoft.device.display.samples.twopage.VerticalViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/pager"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.microsoft.device.display.samples.twopage.VerticalViewPager
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</FrameLayout>
\ No newline at end of file
+    android:layout_height="match_parent" />
diff --git a/TwoPage/src/main/res/layout/single_screen_layout.xml b/TwoPage/src/main/res/layout/single_screen_layout.xml
new file mode 100644
index 00000000..9d49a6da
--- /dev/null
+++ b/TwoPage/src/main/res/layout/single_screen_layout.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.
+  ~ Licensed under the MIT License.
+  ~
+  -->
+
+<androidx.viewpager.widget.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/pager"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/TwoPage/src/main/res/values/colors.xml b/TwoPage/src/main/res/values/colors.xml
index f1fd0100..7d4c4ac4 100644
--- a/TwoPage/src/main/res/values/colors.xml
+++ b/TwoPage/src/main/res/values/colors.xml
@@ -9,4 +9,5 @@
     <color name="colorPrimary">#008577</color>
     <color name="colorPrimaryDark">#00574B</color>
     <color name="colorAccent">#D81B60</color>
+    <color name="black">#000000</color>
 </resources>
diff --git a/build.gradle b/build.gradle
index 248a00b0..326716be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,8 +9,8 @@
 buildscript {
     apply from: 'dependencies.gradle'
 
-    ext.kotlin_version = '1.3.71'
-    
+    ext.kotlin_version = ext.kotlinVersion
+
     repositories {
         google()
         jcenter()
@@ -27,10 +27,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-
-        maven {
-            url config.duoSdkUrl
-        }
     }
     apply from: "$rootDir/ktlint.gradle"
 
diff --git a/dependencies.gradle b/dependencies.gradle
index 6612872f..0f96d8ef 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -5,21 +5,17 @@
  */
 
 ext {
-    gradlePluginVersion = "3.6.3"
-    kotlinVersion = "1.3.72"
+    gradlePluginVersion = "4.1.1"
+    kotlinVersion = "1.4.21"
     compileSdkVersion = 29
     buildToolsVersion = '29.0.2'
     targetSdkVersion = compileSdkVersion
     minSdkVersion = compileSdkVersion
 
-    //Surface Duo
-    duo_url = "https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1"
-
     config = [
+            duoSdkVersion               : "1.0.0-beta1",
             gradlePlugin             : "com.android.tools.build:gradle:$gradlePluginVersion",
             kotlinGradlePlugin       : "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion",
-            duoSdkUrl                :
-                    "https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1",
             testInstrumentationRunner: "androidx.test.runner.AndroidJUnitRunner"
     ]
 
@@ -38,13 +34,13 @@ ext {
     localBroadcastManagerVersion = "1.0.0"
 
     androidxDependencies = [
-            appCompat       : "androidx.appcompat:appcompat:$appCompatVersion",
-            constraintLayout: "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion",
-            recyclerView    : "androidx.recyclerview:recyclerview:$recyclerViewVersion",
-            cardView        : "androidx.cardview:cardview:$cardViewVersion",
-            ktxCore         : "androidx.core:core-ktx:$ktxCoreVersion",
-            ktxFragment     : "androidx.fragment:fragment-ktx:$ktxFragmentVersion",
-            viewPager2      : "androidx.viewpager2:viewpager2:$viewPager2Version",
+            appCompat           : "androidx.appcompat:appcompat:$appCompatVersion",
+            constraintLayout    : "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion",
+            recyclerView        : "androidx.recyclerview:recyclerview:$recyclerViewVersion",
+            cardView            : "androidx.cardview:cardview:$cardViewVersion",
+            ktxCore             : "androidx.core:core-ktx:$ktxCoreVersion",
+            ktxFragment         : "androidx.fragment:fragment-ktx:$ktxFragmentVersion",
+            viewPager2          : "androidx.viewpager2:viewpager2:$viewPager2Version",
             locaBroadcastManager: "androidx.localbroadcastmanager:localbroadcastmanager:$localBroadcastManagerVersion",
     ]
 
@@ -57,18 +53,32 @@ ext {
 
     //Microsoft dependencies version
     dualScreenLayoutVersion = "1.0.0-alpha01"
+    screenManagerWindowManagerVersion = config.duoSdkVersion
+    screenManagerDisplayMaskVersion = config.duoSdkVersion
+    fragmentsHandlerVersion = config.duoSdkVersion
+    layoutsVersion = config.duoSdkVersion
+    bottomNavigationVersion = config.duoSdkVersion
+    recyclerViewVersion = config.duoSdkVersion
+    tabsVersion = config.duoSdkVersion
 
     microsoftDependencies = [
-            dualScreenLayout: "com.microsoft.device:dualscreen-layout:$dualScreenLayoutVersion"
+            screenManagerWindowManager: "com.microsoft.device.dualscreen:screenmanager-windowmanager:$screenManagerWindowManagerVersion",
+            screenManagerDisplayMask  : "com.microsoft.device.dualscreen:screenmanager-displaymask:$screenManagerDisplayMaskVersion",
+            fragmentsHandler          : "com.microsoft.device.dualscreen:fragmentshandler:$fragmentsHandlerVersion",
+            layouts                   : "com.microsoft.device.dualscreen:layouts:$layoutsVersion",
+            bottomNavigation          : "com.microsoft.device.dualscreen:bottomnavigation:$bottomNavigationVersion",
+            recyclerView              : "com.microsoft.device.dualscreen:recyclerview:$recyclerViewVersion",
+            tabs                      : "com.microsoft.device.dualscreen:tabs:$tabsVersion"
     ]
+    microsoftDependencies["screenManager"] = microsoftDependencies.screenManagerWindowManager
 
     //Test dependencies version
     junitVersion = "4.13"
     mockitoVersion = "3.5.9"
 
     testDependencies = [
-            junit   : "junit:junit:$junitVersion",
-            mockito : "org.mockito:mockito-core:$mockitoVersion",
+            junit  : "junit:junit:$junitVersion",
+            mockito: "org.mockito:mockito-core:$mockitoVersion",
     ]
 
     //Android test dependencies version
@@ -81,13 +91,13 @@ ext {
     uiAutomatorVersion = "2.2.0"
 
     instrumentationTestDependencies = [
-            junit           : "androidx.test.ext:junit:$junitInstrumentationVersion",
-            ktxTestCore     : "androidx.test:core-ktx:$ktxTestCoreVersion",
-            espressoCore    : "androidx.test.espresso:espresso-core:$espressoCoreVersion",
-            espressoContrib : "androidx.test.espresso:espresso-contrib:$espressoCoreVersion",
-            espressoIntents : "androidx.test.espresso:espresso-intents:$espressoIntentsVersion",
-            testRunner      : "androidx.test:runner:$testRunnerVersion",
-            testRules       : "androidx.test:rules:$testRulesVersion",
-            uiAutomator     : "androidx.test.uiautomator:uiautomator:$uiAutomatorVersion",
+            junit          : "androidx.test.ext:junit:$junitInstrumentationVersion",
+            ktxTestCore    : "androidx.test:core-ktx:$ktxTestCoreVersion",
+            espressoCore   : "androidx.test.espresso:espresso-core:$espressoCoreVersion",
+            espressoContrib: "androidx.test.espresso:espresso-contrib:$espressoCoreVersion",
+            espressoIntents: "androidx.test.espresso:espresso-intents:$espressoIntentsVersion",
+            testRunner     : "androidx.test:runner:$testRunnerVersion",
+            testRules      : "androidx.test:rules:$testRulesVersion",
+            uiAutomator    : "androidx.test.uiautomator:uiautomator:$uiAutomatorVersion",
     ]
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 6dc7cb16..36c204c6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,5 +22,4 @@ org.gradle.jvmargs=-Xmx1536m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
-
+android.enableJetifier=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a5b14cb9..8de6de4d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,12 +1,6 @@
-#
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-#
-#
-
-#Wed Nov 13 13:53:34 CST 2019
+#Wed Dec 09 14:22:19 EET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip