diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/OnboardingActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/OnboardingActivity.java
index 40891e78d..7b24b3831 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/activity/OnboardingActivity.java
+++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/OnboardingActivity.java
@@ -4,12 +4,14 @@
 
 import androidx.annotation.Nullable;
 
+import org.openobservatory.ooniprobe.R;
 import org.openobservatory.ooniprobe.fragment.onboarding.Onboarding1Fragment;
 
 public class OnboardingActivity extends AbstractActivity {
 
 	@Override protected void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		getSupportFragmentManager().beginTransaction().replace(android.R.id.content, new Onboarding1Fragment()).commit();
+		setContentView(R.layout.activity_blank);
+		getSupportFragmentManager().beginTransaction().replace(R.id.content, new Onboarding1Fragment()).commit();
 	}
 }
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/PreferenceActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/PreferenceActivity.java
index a2753455b..026da39de 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/activity/PreferenceActivity.java
+++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/PreferenceActivity.java
@@ -28,8 +28,9 @@ public static Intent newIntent(Context context, @XmlRes int preferenceResId, Str
 
 	@Override protected void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		fragment = PreferenceFragment.newInstance(getIntent().getIntExtra(PreferenceFragment.ARG_PREFERENCES_RES_ID, 0), android.R.id.content, getIntent().getStringExtra(PreferenceFragment.ARG_PREFERENCE_ROOT));
-		getSupportFragmentManager().beginTransaction().replace(android.R.id.content, fragment).commit();
+		setContentView(R.layout.activity_blank);
+		fragment = PreferenceFragment.newInstance(getIntent().getIntExtra(PreferenceFragment.ARG_PREFERENCES_RES_ID, 0), R.id.content, getIntent().getStringExtra(PreferenceFragment.ARG_PREFERENCE_ROOT));
+		getSupportFragmentManager().beginTransaction().replace(R.id.content, fragment).commit();
 	}
 
 	@Override
diff --git a/app/src/main/res/layout/activity_add_descriptor.xml b/app/src/main/res/layout/activity_add_descriptor.xml
index b581bb3e2..1905265fe 100644
--- a/app/src/main/res/layout/activity_add_descriptor.xml
+++ b/app/src/main/res/layout/activity_add_descriptor.xml
@@ -16,7 +16,8 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_blank.xml b/app/src/main/res/layout/activity_blank.xml
new file mode 100644
index 000000000..d9414fa67
--- /dev/null
+++ b/app/src/main/res/layout/activity_blank.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".activity.PreferenceActivity">
+
+    <FrameLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_customwebsite.xml b/app/src/main/res/layout/activity_customwebsite.xml
index 82c8c50cf..338bf2c13 100644
--- a/app/src/main/res/layout/activity_customwebsite.xml
+++ b/app/src/main/res/layout/activity_customwebsite.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".activity.customwebsites.CustomWebsiteActivity">
 
     <com.google.android.material.appbar.AppBarLayout
diff --git a/app/src/main/res/layout/activity_info.xml b/app/src/main/res/layout/activity_info.xml
index 0a69f8b0d..becabcfb8 100644
--- a/app/src/main/res/layout/activity_info.xml
+++ b/app/src/main/res/layout/activity_info.xml
@@ -2,7 +2,8 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout 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">
+	android:layout_height="match_parent"
+	android:fitsSystemWindows="true">
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_log.xml b/app/src/main/res/layout/activity_log.xml
index 1f9560ece..03f643ba6 100644
--- a/app/src/main/res/layout/activity_log.xml
+++ b/app/src/main/res/layout/activity_log.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".activity.LogActivity">
 
     <Spinner
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index eb14db3cc..1d93dbbca 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,7 +3,8 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:orientation="vertical">
+	android:orientation="vertical"
+	android:fitsSystemWindows="true">
 
 	<FrameLayout
 		android:id="@+id/content"
diff --git a/app/src/main/res/layout/activity_measurement_detail.xml b/app/src/main/res/layout/activity_measurement_detail.xml
index 3fa6b3b66..7e5cc42b5 100644
--- a/app/src/main/res/layout/activity_measurement_detail.xml
+++ b/app/src/main/res/layout/activity_measurement_detail.xml
@@ -3,7 +3,8 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/coordinatorLayout"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:fitsSystemWindows="true">
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_oonirun.xml b/app/src/main/res/layout/activity_oonirun.xml
index 8155c229f..2b42b5e7e 100644
--- a/app/src/main/res/layout/activity_oonirun.xml
+++ b/app/src/main/res/layout/activity_oonirun.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".activity.OoniRunActivity">
 
     <com.google.android.material.appbar.AppBarLayout
diff --git a/app/src/main/res/layout/activity_overview.xml b/app/src/main/res/layout/activity_overview.xml
index 7fa538d7f..9fdf7e592 100644
--- a/app/src/main/res/layout/activity_overview.xml
+++ b/app/src/main/res/layout/activity_overview.xml
@@ -14,7 +14,8 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar_layout"
diff --git a/app/src/main/res/layout/activity_proxy.xml b/app/src/main/res/layout/activity_proxy.xml
index 7f49e920d..4821fed42 100644
--- a/app/src/main/res/layout/activity_proxy.xml
+++ b/app/src/main/res/layout/activity_proxy.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/color_white"
+    android:fitsSystemWindows="true"
     tools:context=".activity.ProxyActivity">
 
     <ScrollView
diff --git a/app/src/main/res/layout/activity_result_detail.xml b/app/src/main/res/layout/activity_result_detail.xml
index 3ea29f6f7..34664449a 100644
--- a/app/src/main/res/layout/activity_result_detail.xml
+++ b/app/src/main/res/layout/activity_result_detail.xml
@@ -5,6 +5,7 @@
     android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".activity.ResultDetailActivity">
 
     <com.google.android.material.appbar.AppBarLayout
diff --git a/app/src/main/res/layout/activity_review_descriptor_updates.xml b/app/src/main/res/layout/activity_review_descriptor_updates.xml
index 7945f49cb..a64aaea33 100644
--- a/app/src/main/res/layout/activity_review_descriptor_updates.xml
+++ b/app/src/main/res/layout/activity_review_descriptor_updates.xml
@@ -5,6 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".activity.reviewdescriptorupdates.ReviewDescriptorUpdatesActivity">
 
     <com.google.android.material.appbar.AppBarLayout
diff --git a/app/src/main/res/layout/activity_run_tests.xml b/app/src/main/res/layout/activity_run_tests.xml
index a7b114923..bed829b82 100644
--- a/app/src/main/res/layout/activity_run_tests.xml
+++ b/app/src/main/res/layout/activity_run_tests.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".activity.runtests.RunTestsActivity">
 
     <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/activity_running.xml b/app/src/main/res/layout/activity_running.xml
index d362cc6b3..585085c46 100644
--- a/app/src/main/res/layout/activity_running.xml
+++ b/app/src/main/res/layout/activity_running.xml
@@ -5,7 +5,8 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:keepScreenOn="true"
-	android:orientation="vertical">
+	android:orientation="vertical"
+	android:fitsSystemWindows="true">
 
 	<RelativeLayout
 		android:layout_width="wrap_content"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 616b8c720..e47f5c813 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 androidGradlePlugin = "8.6.1"
 barista = "4.3.0"
 countlySdk = "24.7.4"
-desugar_jdk_libs_nio = "2.1.2"
+desugar_jdk_libs_nio = "2.1.4"
 faker = "2.0.4"
 mockito = "5.14.2"
 robolectric = "4.13"
@@ -15,12 +15,12 @@ kotlin = "1.9.24"
 
 # Android X
 androidxCore = "1.6.1"
-androidxRunner = "1.6.1"
+androidxRunner = "1.6.2"
 androidxAppCompat = "1.7.0"
 androidxConstraintlayout = "2.2.0"
-androidxLifecycleProcess = "2.8.6"
+androidxLifecycleProcess = "2.8.7"
 androidxPreference = "1.2.1"
-workRuntime = "2.9.1"
+workRuntime = "2.10.0"
 androidxLocalbroadcastmanager = "1.1.0"
 androidxLegacySupportV4 = "1.0.0"
 androidxJunit = "1.2.1"
@@ -31,11 +31,11 @@ googleGson = "2.11.0"
 googleGuava = "33.3.1-android"
 googleMaterial = "1.12.0"
 googleDagger = "2.52"
-googleFirebaseBon = "33.5.1"
+googleFirebaseBon = "33.7.0"
 googlePlayAppUpdate = "2.1.0"
 
 # OONI
-compileSdk = "34"
+compileSdk = "35"
 lottie = "6.6.0"
 markwon = "4.6.2"
 shapeofview = "1.4.7"
@@ -50,7 +50,7 @@ retrofitLoggingInterceptor = "4.12.0"
 
 # Firebase Services
 # https://firebase.google.com/support/release-notes/android
-gms-googleServices = "4.4.1"
+gms-googleServices = "4.4.2"
 
 [libraries]
 # Dependencies of the included build-logic