diff --git a/app/build.gradle b/app/build.gradle
index f26c50e30..87b32dc83 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
     // NDK is not used in Auxio explicitly (used in the ffmpeg extension), but we need to specify
     // it here so that binary stripping will work.
     // TODO: Eventually you might just want to start vendoring the FFMpeg extension so the
@@ -25,7 +25,7 @@ android {
         versionCode 50
 
         minSdk 24
-        targetSdk 34
+        targetSdk 35
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 308962b34..91ca80093 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -48,6 +48,7 @@
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:launchMode="singleTask"
+            android:allowCrossUidActivitySwitchFromBelow="false"
             android:roundIcon="@mipmap/ic_launcher"
             android:windowSoftInputMode="adjustPan">
 
diff --git a/app/src/main/java/org/oxycblt/auxio/AuxioService.kt b/app/src/main/java/org/oxycblt/auxio/AuxioService.kt
index da79b8a11..6fb29284b 100644
--- a/app/src/main/java/org/oxycblt/auxio/AuxioService.kt
+++ b/app/src/main/java/org/oxycblt/auxio/AuxioService.kt
@@ -155,6 +155,8 @@ class AuxioService :
     }
 
     companion object {
+        const val ACTION_START = BuildConfig.APPLICATION_ID + ".service.START"
+
         var isForeground = false
             private set
 
diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
index 530f3f14f..8ddd933a6 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
@@ -71,6 +71,7 @@ class MainActivity : AppCompatActivity() {
 
         startService(
             Intent(this, AuxioService::class.java)
+                .setAction(AuxioService.ACTION_START)
                 .putExtra(AuxioService.INTENT_KEY_START_ID, IntegerTable.START_ID_ACTIVITY))
 
         if (!startIntentAction(intent)) {
diff --git a/app/src/main/java/org/oxycblt/auxio/tasker/Start.kt b/app/src/main/java/org/oxycblt/auxio/tasker/Start.kt
index 1dd5c8997..174ffa884 100644
--- a/app/src/main/java/org/oxycblt/auxio/tasker/Start.kt
+++ b/app/src/main/java/org/oxycblt/auxio/tasker/Start.kt
@@ -61,6 +61,7 @@ class StartActionRunner : TaskerPluginRunnerActionNoOutputOrInput() {
         ContextCompat.startForegroundService(
             context,
             Intent(context, AuxioService::class.java)
+                .setAction(AuxioService.ACTION_START)
                 .putExtra(AuxioService.INTENT_KEY_START_ID, IntegerTable.START_ID_TASKER))
         while (!AuxioService.isForeground) {
             Thread.sleep(100)
diff --git a/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt b/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt
index bf6d9313b..d2321ab5c 100644
--- a/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt
+++ b/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt
@@ -182,7 +182,7 @@ fun Context.newMainPendingIntent(): PendingIntent =
     PendingIntent.getActivity(
         this,
         IntegerTable.REQUEST_CODE,
-        Intent(this, MainActivity::class.java),
+        Intent(this, MainActivity::class.java).setAction(Intent.ACTION_MAIN),
         PendingIntent.FLAG_IMMUTABLE)
 
 /**
diff --git a/build.gradle b/build.gradle
index f3dda8969..575885787 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 }
 
 plugins {
-    id "com.android.application" version '8.5.0' apply false
+    id "com.android.application" version '8.5.2' apply false
     id "androidx.navigation.safeargs.kotlin" version "$navigation_version" apply false
     id "org.jetbrains.kotlin.android" version "$kotlin_version" apply false
     id "com.google.devtools.ksp" version '1.9.23-1.0.20' apply false