diff --git a/catalog/java/io/material/catalog/checkbox/res/layout/cat_checkbox.xml b/catalog/java/io/material/catalog/checkbox/res/layout/cat_checkbox.xml
index 70326890169..ad0f86ca0e0 100644
--- a/catalog/java/io/material/catalog/checkbox/res/layout/cat_checkbox.xml
+++ b/catalog/java/io/material/catalog/checkbox/res/layout/cat_checkbox.xml
@@ -16,110 +16,127 @@
   limitations under the License.
   -->
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <LinearLayout
     android:id="@+id/main_viewGroup"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/cat_checkbox_padding"
-    android:orientation="vertical">
-  <GridLayout
+    android:orientation="vertical"
+    android:padding="@dimen/cat_checkbox_padding">
+
+    <GridLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:columnCount="2"
       android:useDefaultMargins="true">
-    <TextView
+
+      <TextView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_columnSpan="2"
         android:text="@string/cat_checkbox_intro" />
-    <CheckBox
+
+      <CheckBox
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:checked="true"
         android:enabled="true"
-        android:text="@string/cat_checkbox_enabled"/>
-    <CheckBox
+        android:text="@string/cat_checkbox_enabled" />
+
+      <CheckBox
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:checked="false"
         android:enabled="true"
-        android:text="@string/cat_checkbox_enabled"/>
-    <TextView
+        android:text="@string/cat_checkbox_enabled" />
+
+      <TextView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_columnSpan="2"
         android:text="@string/cat_checkbox_disabled_guide" />
-    <CheckBox
+
+      <CheckBox
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:checked="true"
         android:enabled="false"
-        android:text="@string/cat_checkbox_disabled"/>
-    <CheckBox
+        android:text="@string/cat_checkbox_disabled" />
+
+      <CheckBox
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:checked="false"
         android:enabled="false"
-        android:text="@string/cat_checkbox_disabled"/>
-  </GridLayout>
+        android:text="@string/cat_checkbox_disabled" />
+    </GridLayout>
 
-  <com.google.android.material.divider.MaterialDivider
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/cat_checkbox_line_separator_margin"
-    android:layout_marginBottom="@dimen/cat_checkbox_line_separator_margin"/>
+    <com.google.android.material.divider.MaterialDivider
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/cat_checkbox_line_separator_margin"
+      android:layout_marginBottom="@dimen/cat_checkbox_line_separator_margin" />
 
-  <CheckBox
+    <CheckBox
       android:id="@+id/checkbox_toggle"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:checked="false"
       android:enabled="true"
-      android:text="@string/cat_checkbox_enablable_description"/>
-  <LinearLayout
-    android:id="@+id/checkbox_toggle_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/cat_checkbox_indent"
-    android:orientation="vertical">
+      android:text="@string/cat_checkbox_enablable_description" />
+
+    <LinearLayout
+      android:id="@+id/checkbox_toggle_container"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="@dimen/cat_checkbox_indent"
+      android:orientation="vertical">
+
+      <CheckBox
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:checked="true"
+        android:enabled="false"
+        android:text="@string/cat_checkbox_toggle" />
+
+      <CheckBox
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:checked="false"
+        android:enabled="false"
+        android:text="@string/cat_checkbox_toggle" />
+    </LinearLayout>
+
+    <com.google.android.material.divider.MaterialDivider
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/cat_checkbox_line_separator_margin"
+      android:layout_marginBottom="@dimen/cat_checkbox_line_separator_margin" />
+
+    <TextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/cat_checkbox_no_text" />
+
     <CheckBox
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" />
+
+    <com.google.android.material.divider.MaterialDivider
       android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:checked="true"
-      android:enabled="false"
-      android:text="@string/cat_checkbox_toggle"/>
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/cat_checkbox_line_separator_margin"
+      android:layout_marginBottom="@dimen/cat_checkbox_line_separator_margin" />
+
     <CheckBox
+      android:id="@+id/checkbox_toggle_error"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:checked="false"
-      android:enabled="false"
-      android:text="@string/cat_checkbox_toggle"/>
+      android:text="@string/cat_checkbox_toggle_error" />
   </LinearLayout>
 
-  <com.google.android.material.divider.MaterialDivider
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/cat_checkbox_line_separator_margin"
-    android:layout_marginBottom="@dimen/cat_checkbox_line_separator_margin"/>
-
-  <TextView
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:text="@string/cat_checkbox_no_text"/>
-  <CheckBox
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
-
-  <com.google.android.material.divider.MaterialDivider
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/cat_checkbox_line_separator_margin"
-    android:layout_marginBottom="@dimen/cat_checkbox_line_separator_margin"/>
-
-  <CheckBox
-    android:id="@+id/checkbox_toggle_error"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:text="@string/cat_checkbox_toggle_error"/>
-</LinearLayout>
+</ScrollView>
diff --git a/catalog/java/io/material/catalog/fab/res/layout/cat_extended_fab_behavior_fragment.xml b/catalog/java/io/material/catalog/fab/res/layout/cat_extended_fab_behavior_fragment.xml
index a219f02a1c6..98185426d5f 100644
--- a/catalog/java/io/material/catalog/fab/res/layout/cat_extended_fab_behavior_fragment.xml
+++ b/catalog/java/io/material/catalog/fab/res/layout/cat_extended_fab_behavior_fragment.xml
@@ -22,18 +22,13 @@
   <com.google.android.material.appbar.AppBarLayout
       android:id="@+id/app_bar"
       android:layout_width="match_parent"
-      android:layout_height="192dp"
+      android:layout_height="wrap_content"
       android:fitsSystemWindows="true">
+
     <com.google.android.material.appbar.CollapsingToolbarLayout
-        style="?attr/catalogToolbarStyle"
+        style="?attr/collapsingToolbarLayoutLargeStyle"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:collapsedTitleTextAppearance="?attr/textAppearanceHeadline6"
-        app:contentScrim="?attr/colorPrimary"
-        app:expandedTitleGravity="bottom"
-        app:expandedTitleMarginBottom="56dp"
-        app:expandedTitleMarginStart="16dp"
-        app:expandedTitleTextAppearance="?attr/textAppearanceHeadline5"
+        android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
         app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
       <androidx.appcompat.widget.Toolbar
diff --git a/catalog/java/io/material/catalog/fab/res/layout/cat_extended_fab_fragment.xml b/catalog/java/io/material/catalog/fab/res/layout/cat_extended_fab_fragment.xml
index 735c5ea07e3..68b06ce22d0 100644
--- a/catalog/java/io/material/catalog/fab/res/layout/cat_extended_fab_fragment.xml
+++ b/catalog/java/io/material/catalog/fab/res/layout/cat_extended_fab_fragment.xml
@@ -22,13 +22,13 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
   <FrameLayout
-      android:layout_width="wrap_content"
+      android:layout_width="match_parent"
       android:layout_height="0dp"
       android:layout_weight="1">
     <ScrollView
         android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_gravity="center_vertical"/>
   </FrameLayout>
 
diff --git a/catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml b/catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml
index cef790cbca2..7e2c6656cf3 100644
--- a/catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml
+++ b/catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml
@@ -19,7 +19,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
-  android:layout_gravity="center_vertical"
+  android:layout_gravity="center_horizontal"
   android:padding="8dp"
   android:clipToPadding="false"
   android:columnCount="2"
diff --git a/catalog/java/io/material/catalog/materialswitch/res/layout/cat_material_switch.xml b/catalog/java/io/material/catalog/materialswitch/res/layout/cat_material_switch.xml
index b4693b29a04..50cb88a9187 100644
--- a/catalog/java/io/material/catalog/materialswitch/res/layout/cat_material_switch.xml
+++ b/catalog/java/io/material/catalog/materialswitch/res/layout/cat_material_switch.xml
@@ -16,115 +16,134 @@
   limitations under the License.
   -->
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<ScrollView
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <LinearLayout
     android:id="@+id/main_viewGroup"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/cat_switch_padding"
-    android:orientation="vertical">
-  <GridLayout
+    android:orientation="vertical"
+    android:padding="@dimen/cat_switch_padding">
+
+    <GridLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:columnCount="2"
       android:useDefaultMargins="true">
-    <TextView
+
+      <TextView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_columnSpan="2"
         android:text="@string/cat_switch_color_guide"
-        android:textSize="@dimen/cat_switch_header_size"/>
-    <com.google.android.material.materialswitch.MaterialSwitch
+        android:textSize="@dimen/cat_switch_header_size" />
+
+      <com.google.android.material.materialswitch.MaterialSwitch
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:checked="true"
         android:enabled="true"
-        android:text="@string/cat_switch_enabled"/>
-    <com.google.android.material.materialswitch.MaterialSwitch
+        android:text="@string/cat_switch_enabled" />
+
+      <com.google.android.material.materialswitch.MaterialSwitch
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:checked="false"
         android:enabled="true"
-        android:text="@string/cat_switch_enabled"/>
-    <TextView
+        android:text="@string/cat_switch_enabled" />
+
+      <TextView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_columnSpan="2"
         android:text="@string/cat_switch_disabled_guide"
-        android:textSize="@dimen/cat_switch_header_size"/>
-    <com.google.android.material.materialswitch.MaterialSwitch
+        android:textSize="@dimen/cat_switch_header_size" />
+
+      <com.google.android.material.materialswitch.MaterialSwitch
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:checked="true"
         android:enabled="false"
-        android:text="@string/cat_switch_disabled"/>
-    <com.google.android.material.materialswitch.MaterialSwitch
+        android:text="@string/cat_switch_disabled" />
+
+      <com.google.android.material.materialswitch.MaterialSwitch
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:checked="false"
         android:enabled="false"
-        android:text="@string/cat_switch_disabled"/>
-  </GridLayout>
-  <ImageView
+        android:text="@string/cat_switch_disabled" />
+    </GridLayout>
+
+    <ImageView
       android:layout_width="match_parent"
       android:layout_height="@dimen/cat_switch_line_separator_thickness"
       android:layout_marginTop="@dimen/cat_switch_line_separator_margin"
       android:layout_marginBottom="@dimen/cat_switch_line_separator_margin"
-      android:background="?attr/colorSecondary"/>
-  <com.google.android.material.materialswitch.MaterialSwitch
+      android:background="?attr/colorSecondary" />
+
+    <com.google.android.material.materialswitch.MaterialSwitch
       android:id="@+id/switch_toggle"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:checked="false"
       android:enabled="true"
       android:text="@string/cat_switch_toggleable_description"
-      android:textSize="@dimen/cat_switch_header_size"/>
-
-  <include layout="@layout/cat_material_switch_toggled" />
+      android:textSize="@dimen/cat_switch_header_size" />
 
-  <ImageView
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/cat_switch_line_separator_thickness"
-    android:layout_marginTop="@dimen/cat_switch_line_separator_margin"
-    android:layout_marginBottom="@dimen/cat_switch_line_separator_margin"
-    android:background="?attr/colorSecondary"/>
+    <include layout="@layout/cat_material_switch_toggled" />
 
-  <GridLayout
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:columnCount="2"
-    android:useDefaultMargins="true">
-    <TextView
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_columnSpan="2"
-      android:text="@string/cat_switch_deprecated"
-      android:textSize="@dimen/cat_switch_header_size"/>
-    <com.google.android.material.switchmaterial.SwitchMaterial
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:checked="true"
-      android:enabled="true"
-      android:text="@string/cat_switch_enabled"/>
-    <com.google.android.material.switchmaterial.SwitchMaterial
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:checked="false"
-      android:enabled="true"
-      android:text="@string/cat_switch_enabled"/>
-    <com.google.android.material.switchmaterial.SwitchMaterial
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:checked="true"
-      android:enabled="false"
-      android:text="@string/cat_switch_disabled"/>
-    <com.google.android.material.switchmaterial.SwitchMaterial
+    <ImageView
       android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:checked="false"
-      android:enabled="false"
-      android:text="@string/cat_switch_disabled"/>
-  </GridLayout>
+      android:layout_height="@dimen/cat_switch_line_separator_thickness"
+      android:layout_marginTop="@dimen/cat_switch_line_separator_margin"
+      android:layout_marginBottom="@dimen/cat_switch_line_separator_margin"
+      android:background="?attr/colorSecondary" />
+
+    <GridLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:columnCount="2"
+      android:useDefaultMargins="true">
+
+      <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_columnSpan="2"
+        android:text="@string/cat_switch_deprecated"
+        android:textSize="@dimen/cat_switch_header_size" />
+
+      <com.google.android.material.switchmaterial.SwitchMaterial
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:checked="true"
+        android:enabled="true"
+        android:text="@string/cat_switch_enabled" />
+
+      <com.google.android.material.switchmaterial.SwitchMaterial
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:checked="false"
+        android:enabled="true"
+        android:text="@string/cat_switch_enabled" />
+
+      <com.google.android.material.switchmaterial.SwitchMaterial
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:checked="true"
+        android:enabled="false"
+        android:text="@string/cat_switch_disabled" />
+
+      <com.google.android.material.switchmaterial.SwitchMaterial
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:checked="false"
+        android:enabled="false"
+        android:text="@string/cat_switch_disabled" />
+    </GridLayout>
+
+  </LinearLayout>
 
-</LinearLayout>
+</ScrollView>
diff --git a/catalog/java/io/material/catalog/progressindicator/res/layout/cat_progress_indicator_determinate_fragment.xml b/catalog/java/io/material/catalog/progressindicator/res/layout/cat_progress_indicator_determinate_fragment.xml
index 2cd91d6c501..c4bb00230cd 100644
--- a/catalog/java/io/material/catalog/progressindicator/res/layout/cat_progress_indicator_determinate_fragment.xml
+++ b/catalog/java/io/material/catalog/progressindicator/res/layout/cat_progress_indicator_determinate_fragment.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   Copyright 2020 The Android Open Source Project
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -11,166 +10,188 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+
+<ScrollView 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">
+
+  <LinearLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
+    android:layout_height="wrap_content"
     android:clipChildren="false"
     android:clipToPadding="false"
+    android:divider="@drawable/layout_divider"
     android:orientation="vertical"
-    android:showDividers="middle"
-    android:divider="@drawable/layout_divider">
-  <TextView
+    android:paddingLeft="16dp"
+    android:paddingTop="16dp"
+    android:paddingRight="16dp"
+    android:showDividers="middle">
+
+    <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:text="@string/cat_progress_indicator_start_to_end_linear_single_color"/>
-  <com.google.android.material.progressindicator.LinearProgressIndicator
+      android:text="@string/cat_progress_indicator_start_to_end_linear_single_color" />
+
+    <com.google.android.material.progressindicator.LinearProgressIndicator
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"/>
+      android:layout_height="wrap_content" />
 
-  <TextView
+    <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:text="@string/cat_progress_indicator_rounded_end_to_start_linear_single_color"/>
-  <com.google.android.material.progressindicator.LinearProgressIndicator
+      android:text="@string/cat_progress_indicator_rounded_end_to_start_linear_single_color" />
+
+    <com.google.android.material.progressindicator.LinearProgressIndicator
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       app:indicatorDirectionLinear="endToStart"
-      app:trackCornerRadius="@dimen/mtrl_progress_indicator_full_rounded_corner_radius"/>
+      app:trackCornerRadius="@dimen/mtrl_progress_indicator_full_rounded_corner_radius" />
 
-  <TextView
+    <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:text="@string/cat_progress_indicator_left_to_right_linear_multiple_colors_anchored_top"/>
-  <com.google.android.material.progressindicator.LinearProgressIndicator
+      android:text="@string/cat_progress_indicator_left_to_right_linear_multiple_colors_anchored_top" />
+
+    <com.google.android.material.progressindicator.LinearProgressIndicator
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      app:hideAnimationBehavior="outward"
       app:indicatorColor="@array/cat_custom_progress_colors"
       app:indicatorDirectionLinear="leftToRight"
-      app:showAnimationBehavior="inward"
-      app:hideAnimationBehavior="outward"/>
+      app:showAnimationBehavior="inward" />
 
-  <TextView
+    <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:text="@string/cat_progress_indicator_right_to_left_linear_multiple_colors_anchored_bottom"/>
-  <com.google.android.material.progressindicator.LinearProgressIndicator
+      android:text="@string/cat_progress_indicator_right_to_left_linear_multiple_colors_anchored_bottom" />
+
+    <com.google.android.material.progressindicator.LinearProgressIndicator
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      app:hideAnimationBehavior="inward"
       app:indicatorColor="@array/cat_custom_progress_colors"
       app:indicatorDirectionLinear="rightToLeft"
-      app:showAnimationBehavior="outward"
-      app:hideAnimationBehavior="inward"/>
+      app:showAnimationBehavior="outward" />
 
-  <LinearLayout
+    <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:divider="@drawable/layout_divider"
       android:orientation="vertical"
-      android:showDividers="middle"
-      android:divider="@drawable/layout_divider">
-    <LinearLayout
+      android:showDividers="middle">
+
+      <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-      <TextView
+
+        <TextView
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_weight="1"
-          android:text="@string/cat_progress_indicator_clockwise_circular_single_color"/>
-      <com.google.android.material.progressindicator.CircularProgressIndicator
+          android:text="@string/cat_progress_indicator_clockwise_circular_single_color" />
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_gravity="center"/>
-    </LinearLayout>
+          android:layout_gravity="center" />
+      </LinearLayout>
 
-    <LinearLayout
+      <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-      <TextView
+
+        <TextView
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_weight="1"
-          android:text="@string/cat_progress_indicator_rounded_counterclockwise_circular_single_color"/>
-      <com.google.android.material.progressindicator.CircularProgressIndicator
+          android:text="@string/cat_progress_indicator_rounded_counterclockwise_circular_single_color" />
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_gravity="center"
           app:indicatorDirectionCircular="counterclockwise"
-          app:trackCornerRadius="@dimen/mtrl_progress_indicator_full_rounded_corner_radius"/>
-    </LinearLayout>
+          app:trackCornerRadius="@dimen/mtrl_progress_indicator_full_rounded_corner_radius" />
+      </LinearLayout>
 
-    <LinearLayout
+      <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-      <TextView
+
+        <TextView
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_weight="1"
-          android:text="@string/cat_progress_indicator_clockwise_circular_multiple_colors_anchored_outer"/>
-      <com.google.android.material.progressindicator.CircularProgressIndicator
+          android:text="@string/cat_progress_indicator_clockwise_circular_multiple_colors_anchored_outer" />
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_gravity="center"
+          app:hideAnimationBehavior="outward"
           app:indicatorColor="@array/cat_custom_progress_colors"
-          app:showAnimationBehavior="inward"
-          app:hideAnimationBehavior="outward"/>
-    </LinearLayout>
+          app:showAnimationBehavior="inward" />
+      </LinearLayout>
 
-    <LinearLayout
+      <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-      <TextView
+
+        <TextView
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_weight="1"
-          android:text="@string/cat_progress_indicator_clockwise_circular_multiple_colors_anchored_inner"/>
-      <com.google.android.material.progressindicator.CircularProgressIndicator
+          android:text="@string/cat_progress_indicator_clockwise_circular_multiple_colors_anchored_inner" />
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_gravity="center"
+          app:hideAnimationBehavior="inward"
           app:indicatorColor="@array/cat_custom_progress_colors"
-          app:showAnimationBehavior="outward"
-          app:hideAnimationBehavior="inward"/>
+          app:showAnimationBehavior="outward" />
+      </LinearLayout>
     </LinearLayout>
-  </LinearLayout>
 
-  <com.google.android.material.slider.Slider
+    <com.google.android.material.slider.Slider
       android:id="@+id/slider"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="5dp"
       android:layout_marginStart="5dp"
+      android:layout_marginLeft="5dp"
+      android:stepSize="1"
       android:valueFrom="0"
-      android:valueTo="100"
-      android:stepSize="1"/>
+      android:valueTo="100" />
 
-  <LinearLayout
+    <LinearLayout
+      style="?android/buttonBarStyle"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      style="?android/buttonBarStyle"
       android:orientation="horizontal">
-    <Button
+
+      <Button
         android:id="@+id/show_button"
         style="?android/buttonBarButtonStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
         android:layout_margin="1dp"
-        android:text="@string/cat_progress_indicator_show"/>
-    <Button
+        android:layout_weight="1"
+        android:text="@string/cat_progress_indicator_show" />
+
+      <Button
         android:id="@+id/hide_button"
         style="?android/buttonBarButtonStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
         android:layout_margin="1dp"
-        android:text="@string/cat_progress_indicator_hide"/>
+        android:layout_weight="1"
+        android:text="@string/cat_progress_indicator_hide" />
+    </LinearLayout>
   </LinearLayout>
-</LinearLayout>
+
+</ScrollView>
diff --git a/catalog/java/io/material/catalog/switchmaterial/res/layout/cat_switch.xml b/catalog/java/io/material/catalog/switchmaterial/res/layout/cat_switch.xml
index b59d5f393bd..5212df8d935 100644
--- a/catalog/java/io/material/catalog/switchmaterial/res/layout/cat_switch.xml
+++ b/catalog/java/io/material/catalog/switchmaterial/res/layout/cat_switch.xml
@@ -16,68 +16,82 @@
   limitations under the License.
   -->
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<ScrollView
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <LinearLayout
     android:id="@+id/main_viewGroup"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/cat_switch_padding"
-    android:orientation="vertical">
-  <GridLayout
+    android:orientation="vertical"
+    android:padding="@dimen/cat_switch_padding">
+
+    <GridLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:columnCount="2"
       android:useDefaultMargins="true">
-    <TextView
+
+      <TextView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_columnSpan="2"
         android:text="@string/cat_switch_color_guide"
-        android:textSize="@dimen/cat_switch_header_size"/>
-    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:textSize="@dimen/cat_switch_header_size" />
+
+      <com.google.android.material.switchmaterial.SwitchMaterial
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:checked="true"
         android:enabled="true"
-        android:text="@string/cat_switch_enabled"/>
-    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:text="@string/cat_switch_enabled" />
+
+      <com.google.android.material.switchmaterial.SwitchMaterial
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:checked="false"
         android:enabled="true"
-        android:text="@string/cat_switch_enabled"/>
-    <TextView
+        android:text="@string/cat_switch_enabled" />
+
+      <TextView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_columnSpan="2"
         android:text="@string/cat_switch_disabled_guide"
-        android:textSize="@dimen/cat_switch_header_size"/>
-    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:textSize="@dimen/cat_switch_header_size" />
+
+      <com.google.android.material.switchmaterial.SwitchMaterial
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:checked="true"
         android:enabled="false"
-        android:text="@string/cat_switch_disabled"/>
-    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:text="@string/cat_switch_disabled" />
+
+      <com.google.android.material.switchmaterial.SwitchMaterial
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:checked="false"
         android:enabled="false"
-        android:text="@string/cat_switch_disabled"/>
-  </GridLayout>
-  <ImageView
+        android:text="@string/cat_switch_disabled" />
+    </GridLayout>
+
+    <ImageView
       android:layout_width="match_parent"
       android:layout_height="@dimen/cat_switch_line_separator_thickness"
       android:layout_marginTop="@dimen/cat_switch_line_separator_margin"
       android:layout_marginBottom="@dimen/cat_switch_line_separator_margin"
-      android:background="?attr/colorSecondary"/>
-  <com.google.android.material.switchmaterial.SwitchMaterial
+      android:background="?attr/colorSecondary" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
       android:id="@+id/switch_toggle"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:checked="false"
       android:enabled="true"
       android:text="@string/cat_switch_toggleable_description"
-      android:textSize="@dimen/cat_switch_header_size"/>
-</LinearLayout>
+      android:textSize="@dimen/cat_switch_header_size" />
+  </LinearLayout>
+
+</ScrollView>
diff --git a/catalog/java/io/material/catalog/tableofcontents/TocFragment.java b/catalog/java/io/material/catalog/tableofcontents/TocFragment.java
index fe8c2d2ed90..279e4776675 100644
--- a/catalog/java/io/material/catalog/tableofcontents/TocFragment.java
+++ b/catalog/java/io/material/catalog/tableofcontents/TocFragment.java
@@ -147,13 +147,6 @@ public View onCreateView(
     return view;
   }
 
-  @Override
-  public void onDestroyView() {
-    super.onDestroyView();
-
-    ((AppCompatActivity) getActivity()).setSupportActionBar(null);
-  }
-
   private void addGridTopDividerVisibilityListener() {
     appBarLayout.addOnOffsetChangedListener(
         (appBarLayout, verticalOffset) -> {
diff --git a/catalog/java/io/material/catalog/textfield/res/layout/cat_textfield_content.xml b/catalog/java/io/material/catalog/textfield/res/layout/cat_textfield_content.xml
index c792ebf25b6..1e34772a9a7 100644
--- a/catalog/java/io/material/catalog/textfield/res/layout/cat_textfield_content.xml
+++ b/catalog/java/io/material/catalog/textfield/res/layout/cat_textfield_content.xml
@@ -15,72 +15,78 @@
   ~ limitations under the License.
   -->
 
+<ScrollView
+  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="wrap_content">
+
   <LinearLayout
-    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="wrap_content"
-      android:layout_margin="@dimen/cat_textfield_standard_spacing"
-      android:orientation="vertical">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="@dimen/cat_textfield_standard_spacing"
+    android:orientation="vertical">
 
     <!-- Default width of text fields should be 245dp. -->
     <com.google.android.material.textfield.TextInputLayout
-        style="?attr/textInputOutlinedStyle"
-        android:layout_width="@dimen/material_textinput_default_width"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:layout_gravity="center_horizontal"
-        android:hint="@string/cat_textfield_label"
-        app:helperText="@string/cat_textfield_outlined_helper_text"
-        app:helperTextEnabled="true"
-        app:placeholderText="@string/cat_textfield_placeholder_text">
+      style="?attr/textInputOutlinedStyle"
+      android:layout_width="@dimen/material_textinput_default_width"
+      android:layout_height="wrap_content"
+      android:layout_margin="4dp"
+      android:layout_gravity="center_horizontal"
+      android:hint="@string/cat_textfield_label"
+      app:helperText="@string/cat_textfield_outlined_helper_text"
+      app:helperTextEnabled="true"
+      app:placeholderText="@string/cat_textfield_placeholder_text">
       <com.google.android.material.textfield.TextInputEditText
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        style="?attr/textInputOutlinedDenseStyle"
-        android:layout_width="@dimen/material_textinput_default_width"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:layout_gravity="center_horizontal"
-        android:hint="@string/cat_textfield_label"
-        app:helperText="@string/cat_textfield_outlined_dense_helper_text"
-        app:helperTextEnabled="true"
-        app:placeholderText="@string/cat_textfield_placeholder_text">
+      style="?attr/textInputOutlinedDenseStyle"
+      android:layout_width="@dimen/material_textinput_default_width"
+      android:layout_height="wrap_content"
+      android:layout_margin="4dp"
+      android:layout_gravity="center_horizontal"
+      android:hint="@string/cat_textfield_label"
+      app:helperText="@string/cat_textfield_outlined_dense_helper_text"
+      app:helperTextEnabled="true"
+      app:placeholderText="@string/cat_textfield_placeholder_text">
       <com.google.android.material.textfield.TextInputEditText
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        style="?attr/textInputFilledStyle"
-        android:layout_width="@dimen/material_textinput_default_width"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:layout_gravity="center_horizontal"
-        android:hint="@string/cat_textfield_label"
-        app:helperText="@string/cat_textfield_filled_helper_text"
-        app:helperTextEnabled="true"
-        app:placeholderText="@string/cat_textfield_placeholder_text">
+      style="?attr/textInputFilledStyle"
+      android:layout_width="@dimen/material_textinput_default_width"
+      android:layout_height="wrap_content"
+      android:layout_margin="4dp"
+      android:layout_gravity="center_horizontal"
+      android:hint="@string/cat_textfield_label"
+      app:helperText="@string/cat_textfield_filled_helper_text"
+      app:helperTextEnabled="true"
+      app:placeholderText="@string/cat_textfield_placeholder_text">
       <com.google.android.material.textfield.TextInputEditText
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        style="?attr/textInputFilledDenseStyle"
-        android:layout_width="@dimen/material_textinput_default_width"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:layout_gravity="center_horizontal"
-        android:hint="@string/cat_textfield_label"
-        app:helperText="@string/cat_textfield_filled_dense_helper_text"
-        app:helperTextEnabled="true"
-        app:placeholderText="@string/cat_textfield_placeholder_text">
+      style="?attr/textInputFilledDenseStyle"
+      android:layout_width="@dimen/material_textinput_default_width"
+      android:layout_height="wrap_content"
+      android:layout_margin="4dp"
+      android:layout_gravity="center_horizontal"
+      android:hint="@string/cat_textfield_label"
+      app:helperText="@string/cat_textfield_filled_dense_helper_text"
+      app:helperTextEnabled="true"
+      app:placeholderText="@string/cat_textfield_placeholder_text">
       <com.google.android.material.textfield.TextInputEditText
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
     </com.google.android.material.textfield.TextInputLayout>
   </LinearLayout>
+
+</ScrollView>