diff --git a/ViewPager2/app/src/main/AndroidManifest.xml b/ViewPager2/app/src/main/AndroidManifest.xml
index 2ba748b0..0278557b 100644
--- a/ViewPager2/app/src/main/AndroidManifest.xml
+++ b/ViewPager2/app/src/main/AndroidManifest.xml
@@ -80,7 +80,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".ParallelNestedScrollingActivity">
+        <activity android:name=".ParallelNestedScrollingActivity"
+            android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.SAMPLE_CODE"/>
diff --git a/ViewPager2/app/src/main/java/androidx/viewpager2/integration/testapp/ParallelNestedScrollingActivity.kt b/ViewPager2/app/src/main/java/androidx/viewpager2/integration/testapp/ParallelNestedScrollingActivity.kt
index c20b77dd..66ef1bf5 100644
--- a/ViewPager2/app/src/main/java/androidx/viewpager2/integration/testapp/ParallelNestedScrollingActivity.kt
+++ b/ViewPager2/app/src/main/java/androidx/viewpager2/integration/testapp/ParallelNestedScrollingActivity.kt
@@ -39,6 +39,7 @@ class ParallelNestedScrollingActivity : Activity() {
             layoutParams = matchParent()
             orientation = ORIENTATION_HORIZONTAL
             adapter = VpAdapter()
+            offscreenPageLimit = 1
         }
         setContentView(viewPager)
     }