diff --git a/androidshared/src/main/java/org/odk/collect/androidshared/ui/multiclicksafe/MultiClickSafeImageButton.kt b/androidshared/src/main/java/org/odk/collect/androidshared/ui/multiclicksafe/MultiClickSafeImageButton.kt
deleted file mode 100644
index 109c7355cf4..00000000000
--- a/androidshared/src/main/java/org/odk/collect/androidshared/ui/multiclicksafe/MultiClickSafeImageButton.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.odk.collect.androidshared.ui.multiclicksafe
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatImageButton
-import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickGuard.allowClick
-
-class MultiClickSafeImageButton : AppCompatImageButton {
-    constructor(context: Context) : super(context)
-
-    constructor(context: Context, attrs: AttributeSet?) : super(
-        context,
-        attrs
-    )
-
-    override fun performClick(): Boolean {
-        return allowClick() && super.performClick()
-    }
-}
diff --git a/androidshared/src/main/java/org/odk/collect/androidshared/ui/multiclicksafe/MultiClickSafeButton.kt b/androidshared/src/main/java/org/odk/collect/androidshared/ui/multiclicksafe/MultiClickSafeMaterialButton.kt
similarity index 71%
rename from androidshared/src/main/java/org/odk/collect/androidshared/ui/multiclicksafe/MultiClickSafeButton.kt
rename to androidshared/src/main/java/org/odk/collect/androidshared/ui/multiclicksafe/MultiClickSafeMaterialButton.kt
index 8e6898cbd88..e270628f7f4 100644
--- a/androidshared/src/main/java/org/odk/collect/androidshared/ui/multiclicksafe/MultiClickSafeButton.kt
+++ b/androidshared/src/main/java/org/odk/collect/androidshared/ui/multiclicksafe/MultiClickSafeMaterialButton.kt
@@ -5,7 +5,7 @@ import android.util.AttributeSet
 import com.google.android.material.button.MaterialButton
 import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickGuard.allowClick
 
-class MultiClickSafeButton : MaterialButton {
+open class MultiClickSafeMaterialButton : MaterialButton {
     constructor(context: Context) : super(context)
 
     constructor(context: Context, attrs: AttributeSet?) : super(
@@ -13,6 +13,12 @@ class MultiClickSafeButton : MaterialButton {
         attrs
     )
 
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    )
+
     override fun performClick(): Boolean {
         return allowClick() && super.performClick()
     }
diff --git a/collect_app/src/main/java/org/odk/collect/android/audio/AudioButton.java b/collect_app/src/main/java/org/odk/collect/android/audio/AudioButton.java
index 5d447aab2c6..90893db6a7e 100644
--- a/collect_app/src/main/java/org/odk/collect/android/audio/AudioButton.java
+++ b/collect_app/src/main/java/org/odk/collect/android/audio/AudioButton.java
@@ -19,15 +19,14 @@
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.google.android.material.button.MaterialButton;
-
 import org.odk.collect.android.R;
+import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton;
 
 /**
  * @author ctsims
  * @author carlhartung
  */
-public class AudioButton extends MaterialButton implements View.OnClickListener {
+public class AudioButton extends MultiClickSafeMaterialButton implements View.OnClickListener {
 
     private Listener listener;
 
diff --git a/collect_app/src/main/java/org/odk/collect/android/audio/AudioControllerView.java b/collect_app/src/main/java/org/odk/collect/android/audio/AudioControllerView.java
index 2ffd53829b1..6c666ee11e1 100644
--- a/collect_app/src/main/java/org/odk/collect/android/audio/AudioControllerView.java
+++ b/collect_app/src/main/java/org/odk/collect/android/audio/AudioControllerView.java
@@ -24,10 +24,9 @@
 
 import androidx.core.content.ContextCompat;
 
-import com.google.android.material.button.MaterialButton;
-
 import org.odk.collect.android.R;
 import org.odk.collect.android.databinding.AudioControllerLayoutBinding;
+import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton;
 
 import static java.lang.Math.max;
 import static java.lang.Math.min;
@@ -39,7 +38,7 @@ public class AudioControllerView extends FrameLayout {
 
     private final TextView currentDurationLabel;
     private final TextView totalDurationLabel;
-    private final MaterialButton playButton;
+    private final MultiClickSafeMaterialButton playButton;
     private final SeekBar seekBar;
     private final SwipeListener swipeListener;
 
diff --git a/collect_app/src/main/java/org/odk/collect/android/formentry/ODKView.java b/collect_app/src/main/java/org/odk/collect/android/formentry/ODKView.java
index 98a99a73abc..4f21dec5e79 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formentry/ODKView.java
+++ b/collect_app/src/main/java/org/odk/collect/android/formentry/ODKView.java
@@ -42,8 +42,6 @@
 import androidx.core.widget.NestedScrollView;
 import androidx.lifecycle.LifecycleOwner;
 
-import com.google.android.material.button.MaterialButton;
-
 import org.javarosa.core.model.Constants;
 import org.javarosa.core.model.FormIndex;
 import org.javarosa.core.model.IFormElement;
@@ -84,6 +82,7 @@
 import org.odk.collect.android.widgets.utilities.WaitingForDataRegistry;
 import org.odk.collect.androidshared.system.IntentLauncher;
 import org.odk.collect.androidshared.ui.ToastUtils;
+import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton;
 import org.odk.collect.audioclips.PlaybackFailedException;
 import org.odk.collect.audiorecorder.recording.AudioRecorder;
 import org.odk.collect.permissions.PermissionListener;
@@ -425,7 +424,7 @@ private void addIntentLaunchButton(Context context, FormEntryPrompt[] questionPr
         errorString = (v != null) ? v : context.getString(org.odk.collect.strings.R.string.no_app);
 
         // set button formatting
-        MaterialButton launchIntentButton = findViewById(R.id.launchIntentButton);
+        MultiClickSafeMaterialButton launchIntentButton = findViewById(R.id.launchIntentButton);
         launchIntentButton.setText(buttonText);
         launchIntentButton.setTextSize(QuestionFontSizeUtils.getFontSize(settingsProvider.getUnprotectedSettings(), QuestionFontSizeUtils.FontSize.BODY_LARGE));
         launchIntentButton.setVisibility(VISIBLE);
diff --git a/collect_app/src/main/java/org/odk/collect/android/instancemanagement/send/InstanceUploaderListActivity.java b/collect_app/src/main/java/org/odk/collect/android/instancemanagement/send/InstanceUploaderListActivity.java
index 4af87357257..c499dfdf88d 100644
--- a/collect_app/src/main/java/org/odk/collect/android/instancemanagement/send/InstanceUploaderListActivity.java
+++ b/collect_app/src/main/java/org/odk/collect/android/instancemanagement/send/InstanceUploaderListActivity.java
@@ -350,10 +350,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
             return true;
         }
 
-        if (!MultiClickGuard.allowClick(getClass().getName())) {
-            return true;
-        }
-
         if (item.getItemId() == R.id.menu_sort) {
             new FormListSortingBottomSheetDialog(
                     this,
diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/PrinterWidget.kt b/collect_app/src/main/java/org/odk/collect/android/widgets/PrinterWidget.kt
index feddaf95abe..64df71b147c 100644
--- a/collect_app/src/main/java/org/odk/collect/android/widgets/PrinterWidget.kt
+++ b/collect_app/src/main/java/org/odk/collect/android/widgets/PrinterWidget.kt
@@ -5,13 +5,13 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.google.android.material.button.MaterialButton
 import org.javarosa.core.model.data.IAnswerData
 import org.javarosa.form.api.FormEntryPrompt
 import org.odk.collect.android.R
 import org.odk.collect.android.formentry.questions.QuestionDetails
 import org.odk.collect.android.utilities.QuestionMediaManager
 import org.odk.collect.android.widgets.interfaces.Printer
+import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
 
 class PrinterWidget(
     context: Context,
@@ -27,7 +27,7 @@ class PrinterWidget(
     override fun onCreateAnswerView(context: Context, prompt: FormEntryPrompt, answerFontSize: Int): View {
         val answerView = LayoutInflater.from(context).inflate(R.layout.printer_widget, null)
         answerView
-            .findViewById<MaterialButton>(R.id.printer_button)
+            .findViewById<MultiClickSafeMaterialButton>(R.id.printer_button)
             .setOnClickListener {
                 print()
             }
diff --git a/collect_app/src/main/res/layout/annotate_widget.xml b/collect_app/src/main/res/layout/annotate_widget.xml
index e75ae05fde9..6d7fc825649 100644
--- a/collect_app/src/main/res/layout/annotate_widget.xml
+++ b/collect_app/src/main/res/layout/annotate_widget.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/capture_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:layout_width="match_parent"
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/choose_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:layout_width="match_parent"
@@ -30,7 +30,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/capture_button" />
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/annotate_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:layout_width="match_parent"
diff --git a/collect_app/src/main/res/layout/arbitrary_file_widget_answer.xml b/collect_app/src/main/res/layout/arbitrary_file_widget_answer.xml
index 1a45432b831..589895c7539 100644
--- a/collect_app/src/main/res/layout/arbitrary_file_widget_answer.xml
+++ b/collect_app/src/main/res/layout/arbitrary_file_widget_answer.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.google.android.material.button.MaterialButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/arbitrary_file_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/choose_file"
diff --git a/collect_app/src/main/res/layout/audio_controller_layout.xml b/collect_app/src/main/res/layout/audio_controller_layout.xml
index 93ea53ab68e..ed3b8e11104 100644
--- a/collect_app/src/main/res/layout/audio_controller_layout.xml
+++ b/collect_app/src/main/res/layout/audio_controller_layout.xml
@@ -24,7 +24,7 @@ limitations under the License.
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <com.google.android.material.button.MaterialButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/play"
             style="@style/Widget.Material3.Button.IconButton.Filled"
             android:layout_width="wrap_content"
@@ -72,7 +72,7 @@ limitations under the License.
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        <com.google.android.material.button.MaterialButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/remove"
             style="?materialButtonOutlinedIconStyle"
             android:layout_width="wrap_content"
diff --git a/collect_app/src/main/res/layout/audio_recording_controller_fragment.xml b/collect_app/src/main/res/layout/audio_recording_controller_fragment.xml
index 0f9dc7aeac0..1f1ba467c04 100644
--- a/collect_app/src/main/res/layout/audio_recording_controller_fragment.xml
+++ b/collect_app/src/main/res/layout/audio_recording_controller_fragment.xml
@@ -49,7 +49,7 @@
         android:layout_marginStart="@dimen/margin_standard"
         android:orientation="horizontal">
 
-        <com.google.android.material.button.MaterialButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/pause_recording"
             style="?materialIconButtonOutlinedStyle"
             android:layout_width="wrap_content"
@@ -58,7 +58,7 @@
             android:contentDescription="@string/pause_recording"
             app:icon="@drawable/ic_pause_24dp" />
 
-        <com.google.android.material.button.MaterialButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/stop_recording"
             style="@style/Widget.Material3.Button.IconButton.Filled"
             android:layout_width="wrap_content"
diff --git a/collect_app/src/main/res/layout/audio_video_image_text_label.xml b/collect_app/src/main/res/layout/audio_video_image_text_label.xml
index 73355002f28..982ded0f48b 100644
--- a/collect_app/src/main/res/layout/audio_video_image_text_label.xml
+++ b/collect_app/src/main/res/layout/audio_video_image_text_label.xml
@@ -71,7 +71,7 @@
             android:visibility="gone"
             tools:visibility="visible" />
 
-        <com.google.android.material.button.MaterialButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/videoButton"
             style="?materialIconButtonOutlinedStyle"
             android:layout_width="@dimen/touch_target_size"
diff --git a/collect_app/src/main/res/layout/audio_widget_answer.xml b/collect_app/src/main/res/layout/audio_widget_answer.xml
index 15ab19e5766..599709765d3 100644
--- a/collect_app/src/main/res/layout/audio_widget_answer.xml
+++ b/collect_app/src/main/res/layout/audio_widget_answer.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/record_audio_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/capture_audio"
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         app:icon="@drawable/ic_baseline_mic_white_24" />
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/choose_audio_button"
         android:layout_marginTop="@dimen/margin_extra_small"
         style="?widgetButtonIconQuestionWidgetStyle"
diff --git a/collect_app/src/main/res/layout/barcode_widget_answer.xml b/collect_app/src/main/res/layout/barcode_widget_answer.xml
index d8dd80c0705..1fc1bcf1a19 100644
--- a/collect_app/src/main/res/layout/barcode_widget_answer.xml
+++ b/collect_app/src/main/res/layout/barcode_widget_answer.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.google.android.material.button.MaterialButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/barcode_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/get_barcode"
diff --git a/collect_app/src/main/res/layout/bearing_widget_answer.xml b/collect_app/src/main/res/layout/bearing_widget_answer.xml
index 0812d218463..8921a586ca7 100644
--- a/collect_app/src/main/res/layout/bearing_widget_answer.xml
+++ b/collect_app/src/main/res/layout/bearing_widget_answer.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/bearing_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/get_bearing"
diff --git a/collect_app/src/main/res/layout/date_widget_answer.xml b/collect_app/src/main/res/layout/date_widget_answer.xml
index b1933c6076e..75646f6ac46 100644
--- a/collect_app/src/main/res/layout/date_widget_answer.xml
+++ b/collect_app/src/main/res/layout/date_widget_answer.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/date_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/select_date"
diff --git a/collect_app/src/main/res/layout/draw_widget.xml b/collect_app/src/main/res/layout/draw_widget.xml
index 3c64b6dae49..4c4b73e014d 100644
--- a/collect_app/src/main/res/layout/draw_widget.xml
+++ b/collect_app/src/main/res/layout/draw_widget.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/draw_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:layout_width="match_parent"
diff --git a/collect_app/src/main/res/layout/ex_arbitrary_file_widget_answer.xml b/collect_app/src/main/res/layout/ex_arbitrary_file_widget_answer.xml
index a966754374d..a4f59c2e3f2 100644
--- a/collect_app/src/main/res/layout/ex_arbitrary_file_widget_answer.xml
+++ b/collect_app/src/main/res/layout/ex_arbitrary_file_widget_answer.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.google.android.material.button.MaterialButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/ex_arbitrary_file_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/launch_app"
diff --git a/collect_app/src/main/res/layout/ex_audio_widget_answer.xml b/collect_app/src/main/res/layout/ex_audio_widget_answer.xml
index e7d7d42a2df..9020c35d689 100644
--- a/collect_app/src/main/res/layout/ex_audio_widget_answer.xml
+++ b/collect_app/src/main/res/layout/ex_audio_widget_answer.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.google.android.material.button.MaterialButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/launch_external_app_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/launch_app"
diff --git a/collect_app/src/main/res/layout/ex_image_widget_answer.xml b/collect_app/src/main/res/layout/ex_image_widget_answer.xml
index 39b33988db7..9314b874675 100644
--- a/collect_app/src/main/res/layout/ex_image_widget_answer.xml
+++ b/collect_app/src/main/res/layout/ex_image_widget_answer.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.google.android.material.button.MaterialButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/launch_external_app_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/launch_app"
diff --git a/collect_app/src/main/res/layout/ex_printer_widget.xml b/collect_app/src/main/res/layout/ex_printer_widget.xml
index 2660db55c95..d2df40d9266 100644
--- a/collect_app/src/main/res/layout/ex_printer_widget.xml
+++ b/collect_app/src/main/res/layout/ex_printer_widget.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/print_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:layout_width="match_parent"
diff --git a/collect_app/src/main/res/layout/ex_string_question_type.xml b/collect_app/src/main/res/layout/ex_string_question_type.xml
index 8be36c583cd..f12c85dc3b1 100644
--- a/collect_app/src/main/res/layout/ex_string_question_type.xml
+++ b/collect_app/src/main/res/layout/ex_string_question_type.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/launch_app_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/launch_app"
diff --git a/collect_app/src/main/res/layout/ex_video_widget_answer.xml b/collect_app/src/main/res/layout/ex_video_widget_answer.xml
index e1a41666f73..2734b12cf36 100644
--- a/collect_app/src/main/res/layout/ex_video_widget_answer.xml
+++ b/collect_app/src/main/res/layout/ex_video_widget_answer.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.google.android.material.button.MaterialButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/capture_video_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/launch_app"
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         app:icon="@drawable/ic_baseline_videocam_white_24" />
 
-    <com.google.android.material.button.MaterialButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/play_video_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/play_video"
diff --git a/collect_app/src/main/res/layout/first_launch_layout.xml b/collect_app/src/main/res/layout/first_launch_layout.xml
index 3ee9216c98d..2eb4daaea38 100644
--- a/collect_app/src/main/res/layout/first_launch_layout.xml
+++ b/collect_app/src/main/res/layout/first_launch_layout.xml
@@ -43,7 +43,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/logo" />
 
-            <com.google.android.material.button.MaterialButton
+            <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
                 android:id="@+id/configure_via_qr_button"
                 style="?materialButtonIconStyle"
                 android:layout_width="0dp"
@@ -57,7 +57,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintWidth_min="wrap"/>
 
-            <com.google.android.material.button.MaterialButton
+            <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
                 android:id="@+id/configure_manually_button"
                 style="?materialButtonOutlinedIconStyle"
                 android:layout_width="0dp"
diff --git a/collect_app/src/main/res/layout/form_chooser_list_item_map_button.xml b/collect_app/src/main/res/layout/form_chooser_list_item_map_button.xml
index da6529ed739..eb1084ec002 100644
--- a/collect_app/src/main/res/layout/form_chooser_list_item_map_button.xml
+++ b/collect_app/src/main/res/layout/form_chooser_list_item_map_button.xml
@@ -2,7 +2,7 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <com.google.android.material.button.MaterialButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/map_button"
         style="?materialIconButtonOutlinedStyle"
         android:layout_width="wrap_content"
diff --git a/collect_app/src/main/res/layout/form_download_list.xml b/collect_app/src/main/res/layout/form_download_list.xml
index 71c14f50b39..57bc6849ecc 100644
--- a/collect_app/src/main/res/layout/form_download_list.xml
+++ b/collect_app/src/main/res/layout/form_download_list.xml
@@ -63,7 +63,7 @@ the License.
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
-            <com.google.android.material.button.MaterialButton
+            <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
                 android:id="@+id/toggle_button"
                 style="?materialButtonOutlinedStyle"
                 android:layout_width="0dp"
@@ -72,7 +72,7 @@ the License.
                 android:layout_weight="1"
                 android:text="@string/select_all" />
 
-            <com.google.android.material.button.MaterialButton
+            <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
                 android:id="@+id/refresh_button"
                 style="?materialButtonOutlinedStyle"
                 android:layout_width="0dp"
@@ -81,7 +81,7 @@ the License.
                 android:layout_weight="1"
                 android:text="@string/refresh" />
 
-            <com.google.android.material.button.MaterialButton
+            <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
                 android:id="@+id/add_button"
                 style="?materialButtonStyle"
                 android:layout_width="0dp"
diff --git a/collect_app/src/main/res/layout/form_entry.xml b/collect_app/src/main/res/layout/form_entry.xml
index 5ff9d93b233..0dbf70cf2d3 100644
--- a/collect_app/src/main/res/layout/form_entry.xml
+++ b/collect_app/src/main/res/layout/form_entry.xml
@@ -66,7 +66,7 @@ the License.
         android:layout_alignParentBottom="true"
         android:orientation="horizontal">
 
-        <com.google.android.material.button.MaterialButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/form_back_button"
             style="?materialButtonOutlinedIconStyle"
             android:layout_width="0dp"
@@ -79,7 +79,7 @@ the License.
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <com.google.android.material.button.MaterialButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/form_forward_button"
             style="?materialButtonOutlinedIconStyle"
             android:layout_width="0dp"
diff --git a/collect_app/src/main/res/layout/form_entry_end.xml b/collect_app/src/main/res/layout/form_entry_end.xml
index 8b5be57ec42..a282889ed3d 100644
--- a/collect_app/src/main/res/layout/form_entry_end.xml
+++ b/collect_app/src/main/res/layout/form_entry_end.xml
@@ -103,7 +103,7 @@ the specific language governing permissions and limitations under the License.
             app:layout_constraintTop_toBottomOf="@+id/form_edits_warning"
             app:layout_constraintWidth_max="@dimen/max_content_width">
 
-            <com.google.android.material.button.MaterialButton
+            <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
                 android:id="@+id/save_as_draft"
                 style="?materialButtonOutlinedIconStyle"
                 android:layout_width="0dp"
@@ -113,7 +113,7 @@ the specific language governing permissions and limitations under the License.
                 app:icon="@drawable/ic_save_menu_24"
                 app:iconGravity="textStart" />
 
-            <com.google.android.material.button.MaterialButton
+            <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
                 android:id="@+id/finalize"
                 style="?materialButtonIconStyle"
                 android:layout_width="0dp"
diff --git a/collect_app/src/main/res/layout/fragment_scan.xml b/collect_app/src/main/res/layout/fragment_scan.xml
index c9d48130feb..4cf6b990278 100644
--- a/collect_app/src/main/res/layout/fragment_scan.xml
+++ b/collect_app/src/main/res/layout/fragment_scan.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <com.google.android.material.button.MaterialButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/switch_flashlight"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/collect_app/src/main/res/layout/geopoint_question.xml b/collect_app/src/main/res/layout/geopoint_question.xml
index 6840c8753f8..c89c3492413 100644
--- a/collect_app/src/main/res/layout/geopoint_question.xml
+++ b/collect_app/src/main/res/layout/geopoint_question.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/simple_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/get_location"
diff --git a/collect_app/src/main/res/layout/geoshape_question.xml b/collect_app/src/main/res/layout/geoshape_question.xml
index db29cb39f66..e747676e513 100644
--- a/collect_app/src/main/res/layout/geoshape_question.xml
+++ b/collect_app/src/main/res/layout/geoshape_question.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/simple_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/get_shape"
diff --git a/collect_app/src/main/res/layout/geotrace_question.xml b/collect_app/src/main/res/layout/geotrace_question.xml
index 3ca32096f52..7f8495e8f4f 100644
--- a/collect_app/src/main/res/layout/geotrace_question.xml
+++ b/collect_app/src/main/res/layout/geotrace_question.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/simple_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/get_trace"
diff --git a/collect_app/src/main/res/layout/google_drive_deprecation_banner.xml b/collect_app/src/main/res/layout/google_drive_deprecation_banner.xml
index 92454db672e..a379c2615b9 100644
--- a/collect_app/src/main/res/layout/google_drive_deprecation_banner.xml
+++ b/collect_app/src/main/res/layout/google_drive_deprecation_banner.xml
@@ -36,7 +36,7 @@
             app:layout_constraintStart_toEndOf="@id/instance_name_info_icon"
             app:layout_constraintTop_toTopOf="@id/instance_name_info_icon" />
 
-        <com.google.android.material.button.MaterialButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/learn_more_button"
             style="?borderlessButtonStyle"
             android:layout_width="wrap_content"
diff --git a/collect_app/src/main/res/layout/hierarchy_layout.xml b/collect_app/src/main/res/layout/hierarchy_layout.xml
index 869a5f0b8fb..a47342a06b9 100644
--- a/collect_app/src/main/res/layout/hierarchy_layout.xml
+++ b/collect_app/src/main/res/layout/hierarchy_layout.xml
@@ -54,7 +54,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_alignParentBottom="true">
 
-        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/jumpBeginningButton"
             style="?materialButtonOutlinedStyle"
             android:layout_width="0dp"
@@ -65,7 +65,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/jumpEndButton"
             style="?materialButtonOutlinedStyle"
             android:layout_width="0dp"
@@ -77,7 +77,7 @@
             app:layout_constraintStart_toEndOf="@id/jumpBeginningButton"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/exitButton"
             style="?materialButtonOutlinedStyle"
             android:layout_width="0dp"
diff --git a/collect_app/src/main/res/layout/image_widget.xml b/collect_app/src/main/res/layout/image_widget.xml
index b435edf06e7..fdd41d353bc 100644
--- a/collect_app/src/main/res/layout/image_widget.xml
+++ b/collect_app/src/main/res/layout/image_widget.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/capture_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:layout_width="match_parent"
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/choose_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:layout_width="match_parent"
diff --git a/collect_app/src/main/res/layout/instance_uploader_list.xml b/collect_app/src/main/res/layout/instance_uploader_list.xml
index c68d84782e9..01156949beb 100644
--- a/collect_app/src/main/res/layout/instance_uploader_list.xml
+++ b/collect_app/src/main/res/layout/instance_uploader_list.xml
@@ -60,7 +60,7 @@ the License.
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
-            <com.google.android.material.button.MaterialButton
+            <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
                 android:id="@+id/toggle_button"
                 style="?materialButtonOutlinedStyle"
                 android:layout_width="0dp"
@@ -69,7 +69,7 @@ the License.
                 android:layout_weight="1"
                 android:text="@string/select_all" />
 
-            <com.google.android.material.button.MaterialButton
+            <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
                 android:id="@+id/upload_button"
                 style="?materialButtonStyle"
                 android:layout_width="0dp"
diff --git a/collect_app/src/main/res/layout/manual_project_creator_dialog_layout.xml b/collect_app/src/main/res/layout/manual_project_creator_dialog_layout.xml
index f49842803d1..c6e7a23cad7 100644
--- a/collect_app/src/main/res/layout/manual_project_creator_dialog_layout.xml
+++ b/collect_app/src/main/res/layout/manual_project_creator_dialog_layout.xml
@@ -127,7 +127,7 @@
         android:src="@drawable/shadow_up"
         app:layout_constraintBottom_toTopOf="@+id/cancel_button" />
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/cancel_button"
         style="?borderlessButtonStyle"
         android:layout_width="wrap_content"
@@ -137,7 +137,7 @@
         app:layout_constraintEnd_toStartOf="@+id/add_button"
         app:layout_constraintTop_toTopOf="@+id/add_button" />
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/add_button"
         style="?borderlessButtonStyle"
         android:layout_width="wrap_content"
diff --git a/collect_app/src/main/res/layout/map_button.xml b/collect_app/src/main/res/layout/map_button.xml
index 4fd7e05151b..8ea51f25877 100644
--- a/collect_app/src/main/res/layout/map_button.xml
+++ b/collect_app/src/main/res/layout/map_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
+<org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/map_button"
     style="?materialIconButtonOutlinedStyle"
diff --git a/collect_app/src/main/res/layout/odk_view.xml b/collect_app/src/main/res/layout/odk_view.xml
index de625e76a57..ee5283447ae 100644
--- a/collect_app/src/main/res/layout/odk_view.xml
+++ b/collect_app/src/main/res/layout/odk_view.xml
@@ -36,7 +36,7 @@ limitations under the License.
             tools:text="Group text"
             tools:visibility="visible" />
 
-        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/launchIntentButton"
             style="?widgetButtonIconQuestionWidgetStyle"
             android:layout_width="match_parent"
diff --git a/collect_app/src/main/res/layout/osm_widget_answer.xml b/collect_app/src/main/res/layout/osm_widget_answer.xml
index 37214ca1a38..ce0fb00d511 100644
--- a/collect_app/src/main/res/layout/osm_widget_answer.xml
+++ b/collect_app/src/main/res/layout/osm_widget_answer.xml
@@ -3,7 +3,7 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/launch_open_map_kit_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/capture_osm"
diff --git a/collect_app/src/main/res/layout/printer_widget.xml b/collect_app/src/main/res/layout/printer_widget.xml
index 53aedd65331..f0c5da9239b 100644
--- a/collect_app/src/main/res/layout/printer_widget.xml
+++ b/collect_app/src/main/res/layout/printer_widget.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.google.android.material.button.MaterialButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/printer_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:layout_width="0dp"
diff --git a/collect_app/src/main/res/layout/project_settings_dialog_layout.xml b/collect_app/src/main/res/layout/project_settings_dialog_layout.xml
index 075c3ad3b1c..b366416d358 100644
--- a/collect_app/src/main/res/layout/project_settings_dialog_layout.xml
+++ b/collect_app/src/main/res/layout/project_settings_dialog_layout.xml
@@ -47,7 +47,7 @@
         app:layout_constraintStart_toStartOf="@id/guideline_start"
         app:layout_constraintTop_toBottomOf="@id/title" />
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/general_settings_button"
         style="?materialButtonOutlinedIconStyle"
         android:layout_width="wrap_content"
@@ -94,7 +94,7 @@
         app:layout_constraintBottom_toTopOf="@id/add_project_button"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/add_project_button"
         style="?borderlessButtonIconStyle"
         android:layout_width="wrap_content"
@@ -107,7 +107,7 @@
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="@id/guideline_start" />
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/about_button"
         style="?borderlessButtonIconStyle"
         android:layout_width="wrap_content"
diff --git a/collect_app/src/main/res/layout/qr_code_project_creator_dialog_layout.xml b/collect_app/src/main/res/layout/qr_code_project_creator_dialog_layout.xml
index 6967197f4a2..0dbdd4d875e 100644
--- a/collect_app/src/main/res/layout/qr_code_project_creator_dialog_layout.xml
+++ b/collect_app/src/main/res/layout/qr_code_project_creator_dialog_layout.xml
@@ -72,7 +72,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/barcode_view" />
 
-            <com.google.android.material.button.MaterialButton
+            <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
                 android:id="@+id/configure_manually_button"
                 style="?materialButtonOutlinedIconStyle"
                 android:layout_width="wrap_content"
@@ -93,7 +93,7 @@
         android:src="@drawable/shadow_up"
         app:layout_constraintBottom_toTopOf="@+id/cancel_button" />
 
-    <com.google.android.material.button.MaterialButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/cancel_button"
         style="?borderlessButtonStyle"
         android:layout_width="wrap_content"
diff --git a/collect_app/src/main/res/layout/quit_form_dialog_layout.xml b/collect_app/src/main/res/layout/quit_form_dialog_layout.xml
index 7106fa962a1..a16a47f1fe8 100644
--- a/collect_app/src/main/res/layout/quit_form_dialog_layout.xml
+++ b/collect_app/src/main/res/layout/quit_form_dialog_layout.xml
@@ -19,7 +19,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <com.google.android.material.button.MaterialButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/discard_changes"
             style="?materialButtonOutlinedIconStyle"
             android:layout_width="0dp"
@@ -33,7 +33,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/save_explanation" />
 
-        <com.google.android.material.button.MaterialButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/keep_editing_outlined"
             style="?materialButtonOutlinedIconStyle"
             android:layout_width="0dp"
@@ -47,7 +47,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/discard_changes" />
 
-        <com.google.android.material.button.MaterialButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/keep_editing_filled"
             style="?materialButtonStyle"
             android:layout_width="0dp"
@@ -62,7 +62,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/discard_changes" />
 
-        <com.google.android.material.button.MaterialButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/save_changes"
             style="?materialButtonIconStyle"
             android:layout_width="0dp"
diff --git a/collect_app/src/main/res/layout/range_picker_widget_answer.xml b/collect_app/src/main/res/layout/range_picker_widget_answer.xml
index 486566cde1e..3c5763324a7 100644
--- a/collect_app/src/main/res/layout/range_picker_widget_answer.xml
+++ b/collect_app/src/main/res/layout/range_picker_widget_answer.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/widget_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/select_value"
diff --git a/collect_app/src/main/res/layout/ranking_widget.xml b/collect_app/src/main/res/layout/ranking_widget.xml
index 6d211fd5a94..29675b1c537 100644
--- a/collect_app/src/main/res/layout/ranking_widget.xml
+++ b/collect_app/src/main/res/layout/ranking_widget.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/rank_items_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:layout_width="match_parent"
diff --git a/collect_app/src/main/res/layout/reference_layer_help_footer.xml b/collect_app/src/main/res/layout/reference_layer_help_footer.xml
index b2c91068a9a..83d0731ca8a 100644
--- a/collect_app/src/main/res/layout/reference_layer_help_footer.xml
+++ b/collect_app/src/main/res/layout/reference_layer_help_footer.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.button.MaterialButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/help_button"
         style="?borderlessButtonStyle"
         android:layout_width="wrap_content"
diff --git a/collect_app/src/main/res/layout/select_one_from_map_widget_answer.xml b/collect_app/src/main/res/layout/select_one_from_map_widget_answer.xml
index 627f007a719..5251b11b6bf 100644
--- a/collect_app/src/main/res/layout/select_one_from_map_widget_answer.xml
+++ b/collect_app/src/main/res/layout/select_one_from_map_widget_answer.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/select_place"
diff --git a/collect_app/src/main/res/layout/signature_widget.xml b/collect_app/src/main/res/layout/signature_widget.xml
index 8cd2b66b31f..da9eed9cfad 100644
--- a/collect_app/src/main/res/layout/signature_widget.xml
+++ b/collect_app/src/main/res/layout/signature_widget.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/sign_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:layout_width="match_parent"
diff --git a/collect_app/src/main/res/layout/time_widget_answer.xml b/collect_app/src/main/res/layout/time_widget_answer.xml
index c11e2315d6b..5e1d265e148 100644
--- a/collect_app/src/main/res/layout/time_widget_answer.xml
+++ b/collect_app/src/main/res/layout/time_widget_answer.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/time_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/select_time"
diff --git a/collect_app/src/main/res/layout/url_widget_answer.xml b/collect_app/src/main/res/layout/url_widget_answer.xml
index 011b4f1404a..9b793db487a 100644
--- a/collect_app/src/main/res/layout/url_widget_answer.xml
+++ b/collect_app/src/main/res/layout/url_widget_answer.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/url_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:text="@string/open_url"
diff --git a/collect_app/src/main/res/layout/video_widget.xml b/collect_app/src/main/res/layout/video_widget.xml
index c0278e4dcd5..5d7f45ad491 100644
--- a/collect_app/src/main/res/layout/video_widget.xml
+++ b/collect_app/src/main/res/layout/video_widget.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/record_video_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:layout_width="match_parent"
@@ -16,7 +16,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/choose_video_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:layout_width="match_parent"
@@ -29,7 +29,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/record_video_button" />
 
-    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/play_video_button"
         style="?widgetButtonIconQuestionWidgetStyle"
         android:layout_width="match_parent"
diff --git a/collect_app/src/test/java/org/odk/collect/android/formentry/FormEndViewTest.kt b/collect_app/src/test/java/org/odk/collect/android/formentry/FormEndViewTest.kt
index 818eda3df5e..d34e8690c43 100644
--- a/collect_app/src/test/java/org/odk/collect/android/formentry/FormEndViewTest.kt
+++ b/collect_app/src/test/java/org/odk/collect/android/formentry/FormEndViewTest.kt
@@ -5,7 +5,6 @@ import android.view.View
 import android.widget.TextView
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.google.android.material.button.MaterialButton
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.textview.MaterialTextView
 import org.hamcrest.MatcherAssert.assertThat
@@ -16,6 +15,7 @@ import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import org.odk.collect.android.R
+import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
 
 @RunWith(AndroidJUnit4::class)
 class FormEndViewTest {
@@ -45,7 +45,7 @@ class FormEndViewTest {
         whenever(formEndViewModel.isSaveDraftEnabled()).thenReturn(true)
         val view = FormEndView(context, "blah", formEndViewModel, listener)
         assertThat(
-            view.findViewById<MaterialButton>(R.id.save_as_draft).visibility,
+            view.findViewById<MultiClickSafeMaterialButton>(R.id.save_as_draft).visibility,
             equalTo(View.VISIBLE)
         )
     }
@@ -55,7 +55,7 @@ class FormEndViewTest {
         whenever(formEndViewModel.isSaveDraftEnabled()).thenReturn(false)
         val view = FormEndView(context, "blah", formEndViewModel, listener)
         assertThat(
-            view.findViewById<MaterialButton>(R.id.save_as_draft).visibility,
+            view.findViewById<MultiClickSafeMaterialButton>(R.id.save_as_draft).visibility,
             equalTo(View.GONE)
         )
     }
@@ -64,7 +64,7 @@ class FormEndViewTest {
     fun `when 'Save as draft' button is clicked then onSaveClicked is called with false value`() {
         whenever(formEndViewModel.isSaveDraftEnabled()).thenReturn(true)
         val view = FormEndView(context, "blah", formEndViewModel, listener)
-        view.findViewById<MaterialButton>(R.id.save_as_draft).performClick()
+        view.findViewById<MultiClickSafeMaterialButton>(R.id.save_as_draft).performClick()
         verify(listener).onSaveClicked(false)
     }
 
@@ -73,7 +73,7 @@ class FormEndViewTest {
         whenever(formEndViewModel.isFinalizeEnabled()).thenReturn(true)
         val view = FormEndView(context, "blah", formEndViewModel, listener)
         assertThat(
-            view.findViewById<MaterialButton>(R.id.finalize).visibility,
+            view.findViewById<MultiClickSafeMaterialButton>(R.id.finalize).visibility,
             equalTo(View.VISIBLE)
         )
     }
@@ -82,14 +82,14 @@ class FormEndViewTest {
     fun `when finalizing forms is disabled in settings should 'Finalize' button be hidden`() {
         whenever(formEndViewModel.isFinalizeEnabled()).thenReturn(false)
         val view = FormEndView(context, "blah", formEndViewModel, listener)
-        assertThat(view.findViewById<MaterialButton>(R.id.finalize).visibility, equalTo(View.GONE))
+        assertThat(view.findViewById<MultiClickSafeMaterialButton>(R.id.finalize).visibility, equalTo(View.GONE))
     }
 
     @Test
     fun `when 'Finalize' button is clicked then onSaveClicked is called with true value`() {
         whenever(formEndViewModel.isFinalizeEnabled()).thenReturn(true)
         val view = FormEndView(context, "blah", formEndViewModel, listener)
-        view.findViewById<MaterialButton>(R.id.finalize).performClick()
+        view.findViewById<MultiClickSafeMaterialButton>(R.id.finalize).performClick()
         verify(listener).onSaveClicked(true)
     }
 
@@ -98,7 +98,7 @@ class FormEndViewTest {
         whenever(formEndViewModel.shouldFormBeSentAutomatically()).thenReturn(false)
         val view = FormEndView(context, "blah", formEndViewModel, listener)
         assertThat(
-            view.findViewById<MaterialButton>(R.id.finalize).text,
+            view.findViewById<MultiClickSafeMaterialButton>(R.id.finalize).text,
             equalTo(context.getString(org.odk.collect.strings.R.string.finalize))
         )
     }
@@ -108,7 +108,7 @@ class FormEndViewTest {
         whenever(formEndViewModel.shouldFormBeSentAutomatically()).thenReturn(true)
         val view = FormEndView(context, "blah", formEndViewModel, listener)
         assertThat(
-            view.findViewById<MaterialButton>(R.id.finalize).text,
+            view.findViewById<MultiClickSafeMaterialButton>(R.id.finalize).text,
             equalTo(
                 context.getString(
                     org.odk.collect.strings.R.string.send
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/PrinterWidgetTest.kt b/collect_app/src/test/java/org/odk/collect/android/widgets/PrinterWidgetTest.kt
index 3b167f80699..251a8ee9cf7 100644
--- a/collect_app/src/test/java/org/odk/collect/android/widgets/PrinterWidgetTest.kt
+++ b/collect_app/src/test/java/org/odk/collect/android/widgets/PrinterWidgetTest.kt
@@ -1,6 +1,5 @@
 package org.odk.collect.android.widgets
 
-import com.google.android.material.button.MaterialButton
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.javarosa.core.model.data.IAnswerData
@@ -16,6 +15,7 @@ import org.odk.collect.android.formentry.questions.QuestionDetails
 import org.odk.collect.android.support.WidgetTestActivity
 import org.odk.collect.android.utilities.QuestionMediaManager
 import org.odk.collect.android.widgets.base.QuestionWidgetTest
+import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
 import org.odk.collect.printer.HtmlPrinter
 import org.odk.collect.qrcode.QRCodeCreator
 import org.odk.collect.testshared.FakeScheduler
@@ -33,7 +33,7 @@ class PrinterWidgetTest : QuestionWidgetTest<PrinterWidget, IAnswerData>() {
         whenever(formEntryPrompt.answerText).thenReturn("blah")
 
         val widget = createWidget()
-        widget.findViewById<MaterialButton>(R.id.printer_button).performClick()
+        widget.findViewById<MultiClickSafeMaterialButton>(R.id.printer_button).performClick()
         scheduler.runBackground()
         scheduler.runForeground()
 
@@ -45,7 +45,7 @@ class PrinterWidgetTest : QuestionWidgetTest<PrinterWidget, IAnswerData>() {
         whenever(formEntryPrompt.answerText).thenReturn(null)
 
         val widget = createWidget()
-        widget.findViewById<MaterialButton>(R.id.printer_button).performClick()
+        widget.findViewById<MultiClickSafeMaterialButton>(R.id.printer_button).performClick()
 
         verifyNoInteractions(htmlPrinter)
     }
diff --git a/geo/src/main/res/layout/selection_summary_sheet_layout.xml b/geo/src/main/res/layout/selection_summary_sheet_layout.xml
index a401ac626ce..55864930ffe 100644
--- a/geo/src/main/res/layout/selection_summary_sheet_layout.xml
+++ b/geo/src/main/res/layout/selection_summary_sheet_layout.xml
@@ -51,7 +51,7 @@
             app:layout_constraintTop_toBottomOf="@id/name"
             tools:text="Info" />
 
-        <com.google.android.material.button.MaterialButton
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
             android:id="@+id/action"
             style="?materialButtonIconStyle"
             android:layout_width="wrap_content"
diff --git a/geo/src/test/java/org/odk/collect/geo/support/RobolectricApplication.kt b/geo/src/test/java/org/odk/collect/geo/support/RobolectricApplication.kt
index ab515825873..e841c43bf13 100644
--- a/geo/src/test/java/org/odk/collect/geo/support/RobolectricApplication.kt
+++ b/geo/src/test/java/org/odk/collect/geo/support/RobolectricApplication.kt
@@ -2,6 +2,7 @@ package org.odk.collect.geo.support
 
 import android.app.Application
 import org.odk.collect.androidshared.ui.Animations
+import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickGuard
 import org.odk.collect.geo.GeoDependencyComponent
 import org.odk.collect.geo.GeoDependencyComponentProvider
 
@@ -12,5 +13,8 @@ class RobolectricApplication : Application(), GeoDependencyComponentProvider {
     override fun onCreate() {
         super.onCreate()
         Animations.DISABLE_ANIMATIONS = true
+
+        // We don't want any clicks to be blocked
+        MultiClickGuard.test = true
     }
 }
diff --git a/lists/src/main/res/layout/multi_select_controls_layout.xml b/lists/src/main/res/layout/multi_select_controls_layout.xml
index db1cb3bc672..19a1eb37657 100644
--- a/lists/src/main/res/layout/multi_select_controls_layout.xml
+++ b/lists/src/main/res/layout/multi_select_controls_layout.xml
@@ -9,7 +9,7 @@
     android:layout_height="wrap_content"
     style="@style/Widget.AndroidShared.ButtonBar">
 
-    <com.google.android.material.button.MaterialButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/select_all"
         style="?materialButtonOutlinedStyle"
         android:layout_width="0dp"
@@ -19,7 +19,7 @@
         android:layout_weight="1"
         android:text="@string/select_all" />
 
-    <com.google.android.material.button.MaterialButton
+    <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
         android:id="@+id/action"
         style="?materialButtonStyle"
         android:layout_width="0dp"
diff --git a/lists/src/test/java/org/odk/collect/lists/RobolectricApplication.kt b/lists/src/test/java/org/odk/collect/lists/RobolectricApplication.kt
new file mode 100644
index 00000000000..1110cfce0c9
--- /dev/null
+++ b/lists/src/test/java/org/odk/collect/lists/RobolectricApplication.kt
@@ -0,0 +1,13 @@
+package org.odk.collect.lists
+
+import android.app.Application
+import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickGuard
+
+class RobolectricApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+
+        // We don't want any clicks to be blocked
+        MultiClickGuard.test = true
+    }
+}
diff --git a/lists/src/test/resources/robolectric.properties b/lists/src/test/resources/robolectric.properties
new file mode 100644
index 00000000000..d20a6a9e3c2
--- /dev/null
+++ b/lists/src/test/resources/robolectric.properties
@@ -0,0 +1,2 @@
+application=org.odk.collect.lists.RobolectricApplication
+sdk=33
\ No newline at end of file