diff --git a/demos/transformer/build.gradle b/demos/transformer/build.gradle
index 14825588ba..0146ec9e7b 100644
--- a/demos/transformer/build.gradle
+++ b/demos/transformer/build.gradle
@@ -48,6 +48,7 @@ android {
 }
 
 dependencies {
+    implementation 'androidx.core:core:' + androidxCoreVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
diff --git a/demos/transformer/src/main/res/layout/configuration_activity.xml b/demos/transformer/src/main/res/layout/configuration_activity.xml
index c3403a6269..b50d5eaba0 100644
--- a/demos/transformer/src/main/res/layout/configuration_activity.xml
+++ b/demos/transformer/src/main/res/layout/configuration_activity.xml
@@ -58,123 +58,130 @@
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/choose_file_button" />
-  <TableLayout
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:stretchColumns="1"
-    android:layout_marginTop="32dp"
-    android:layout_marginStart="32dp"
-    android:layout_marginEnd="32dp"
-    android:measureWithLargestChild="true"
-    android:paddingLeft="24dp"
-    android:paddingRight="12dp"
+  <androidx.core.widget.NestedScrollView
+    android:layout_width="fill_parent"
+    android:layout_height="0dp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@+id/chosen_file_text_view" >
-    <TableRow
-      android:layout_weight="1"
-      android:gravity="center_vertical" >
-      <TextView
-        android:text="@string/remove_audio" />
-      <CheckBox
-        android:id="@+id/remove_audio_checkbox"
-        android:layout_gravity="right"/>
-    </TableRow>
-    <TableRow
-      android:layout_weight="1"
-      android:gravity="center_vertical" >
-      <TextView
-        android:text="@string/remove_video"/>
-      <CheckBox
-        android:id="@+id/remove_video_checkbox"
-        android:layout_gravity="right" />
-    </TableRow>
-    <TableRow
-      android:layout_weight="1"
-      android:gravity="center_vertical" >
-      <TextView
-        android:text="@string/flatten_for_slow_motion"/>
-      <CheckBox
-        android:id="@+id/flatten_for_slow_motion_checkbox"
-        android:layout_gravity="right" />
-    </TableRow>
-    <TableRow
-      android:layout_weight="1"
-      android:gravity="center_vertical" >
-      <TextView
-        android:id="@+id/audio_mime_text_view"
-        android:text="@string/audio_mime"/>
-      <Spinner
-        android:id="@+id/audio_mime_spinner"
-        android:layout_gravity="right|center_vertical"
-        android:gravity="right" />
-    </TableRow>
-    <TableRow
-      android:layout_weight="1"
-      android:gravity="center_vertical" >
-      <TextView
-        android:id="@+id/video_mime_text_view"
-        android:text="@string/video_mime"/>
-      <Spinner
-        android:id="@+id/video_mime_spinner"
-        android:layout_gravity="right|center_vertical"
-        android:gravity="right" />
-    </TableRow>
-    <TableRow
-      android:layout_weight="1"
-      android:gravity="center_vertical" >
-      <TextView
-        android:id="@+id/resolution_height_text_view"
-        android:text="@string/resolution_height"/>
-      <Spinner
-        android:id="@+id/resolution_height_spinner"
-        android:layout_gravity="right|center_vertical"
-        android:gravity="right" />
-    </TableRow>
-    <TableRow
-      android:layout_weight="1"
-      android:gravity="center_vertical" >
-      <TextView
-        android:id="@+id/translate"
-        android:text="@string/translate"/>
-      <Spinner
-        android:id="@+id/translate_spinner"
-        android:layout_gravity="right|center_vertical"
-        android:gravity="right" />
-    </TableRow>
-    <TableRow
-      android:layout_weight="1"
-      android:gravity="center_vertical" >
-      <TextView
-        android:id="@+id/scale"
-        android:text="@string/scale"/>
-      <Spinner
-        android:id="@+id/scale_spinner"
-        android:layout_gravity="right|center_vertical"
-        android:gravity="right" />
-    </TableRow>
-    <TableRow
-      android:layout_weight="1"
-      android:gravity="center_vertical" >
-      <TextView
-        android:id="@+id/rotate"
-        android:text="@string/rotate"/>
-      <Spinner
-        android:id="@+id/rotate_spinner"
-        android:layout_gravity="right|center_vertical"
-        android:gravity="right" />
-    </TableRow>
-    <TableRow
-      android:layout_weight="1"
-      android:gravity="center_vertical" >
-      <TextView
-        android:id="@+id/hdr_editing"
-        android:text="@string/hdr_editing" />
-      <CheckBox
-        android:id="@+id/hdr_editing_checkbox"
-        android:layout_gravity="right" />
-    </TableRow>
-  </TableLayout>
+    app:layout_constraintTop_toBottomOf="@+id/chosen_file_text_view"
+    app:layout_constraintBottom_toTopOf="@+id/transform_button">
+    <TableLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:stretchColumns="1"
+      android:layout_marginTop="32dp"
+      android:measureWithLargestChild="true"
+      android:paddingLeft="24dp"
+      android:paddingRight="12dp"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      app:layout_constraintBottom_toBottomOf="parent">
+      <TableRow
+        android:layout_weight="1"
+        android:gravity="center_vertical" >
+        <TextView
+          android:text="@string/remove_audio" />
+        <CheckBox
+          android:id="@+id/remove_audio_checkbox"
+          android:layout_gravity="right"/>
+      </TableRow>
+      <TableRow
+        android:layout_weight="1"
+        android:gravity="center_vertical" >
+        <TextView
+          android:text="@string/remove_video"/>
+        <CheckBox
+          android:id="@+id/remove_video_checkbox"
+          android:layout_gravity="right" />
+      </TableRow>
+      <TableRow
+        android:layout_weight="1"
+        android:gravity="center_vertical" >
+        <TextView
+          android:text="@string/flatten_for_slow_motion"/>
+        <CheckBox
+          android:id="@+id/flatten_for_slow_motion_checkbox"
+          android:layout_gravity="right" />
+      </TableRow>
+      <TableRow
+        android:layout_weight="1"
+        android:gravity="center_vertical" >
+        <TextView
+          android:id="@+id/audio_mime_text_view"
+          android:text="@string/audio_mime"/>
+        <Spinner
+          android:id="@+id/audio_mime_spinner"
+          android:layout_gravity="right|center_vertical"
+          android:gravity="right" />
+      </TableRow>
+      <TableRow
+        android:layout_weight="1"
+        android:gravity="center_vertical" >
+        <TextView
+          android:id="@+id/video_mime_text_view"
+          android:text="@string/video_mime"/>
+        <Spinner
+          android:id="@+id/video_mime_spinner"
+          android:layout_gravity="right|center_vertical"
+          android:gravity="right" />
+      </TableRow>
+      <TableRow
+        android:layout_weight="1"
+        android:gravity="center_vertical" >
+        <TextView
+          android:id="@+id/resolution_height_text_view"
+          android:text="@string/resolution_height"/>
+        <Spinner
+          android:id="@+id/resolution_height_spinner"
+          android:layout_gravity="right|center_vertical"
+          android:gravity="right" />
+      </TableRow>
+      <TableRow
+        android:layout_weight="1"
+        android:gravity="center_vertical" >
+        <TextView
+          android:id="@+id/translate"
+          android:text="@string/translate"/>
+        <Spinner
+          android:id="@+id/translate_spinner"
+          android:layout_gravity="right|center_vertical"
+          android:gravity="right" />
+      </TableRow>
+      <TableRow
+        android:layout_weight="1"
+        android:gravity="center_vertical" >
+        <TextView
+          android:id="@+id/scale"
+          android:text="@string/scale"/>
+        <Spinner
+          android:id="@+id/scale_spinner"
+          android:layout_gravity="right|center_vertical"
+          android:gravity="right" />
+      </TableRow>
+      <TableRow
+        android:layout_weight="1"
+        android:gravity="center_vertical" >
+        <TextView
+          android:id="@+id/rotate"
+          android:text="@string/rotate"/>
+        <Spinner
+          android:id="@+id/rotate_spinner"
+          android:layout_gravity="right|center_vertical"
+          android:gravity="right" />
+      </TableRow>
+      <TableRow
+        android:layout_weight="1"
+        android:gravity="center_vertical" >
+        <TextView
+          android:id="@+id/hdr_editing"
+          android:text="@string/hdr_editing" />
+        <CheckBox
+          android:id="@+id/hdr_editing_checkbox"
+          android:layout_gravity="right" />
+      </TableRow>
+    </TableLayout>
+  </androidx.core.widget.NestedScrollView>
   <Button
     android:id="@+id/transform_button"
     android:layout_width="wrap_content"