diff --git a/MediaServiceCore b/MediaServiceCore
index ca90b5873..288cb90f0 160000
--- a/MediaServiceCore
+++ b/MediaServiceCore
@@ -1 +1 @@
-Subproject commit ca90b58739ab65b18effc4cb5be84657edf0815d
+Subproject commit 288cb90f0b72fbc425f653af373076b934289e94
diff --git a/SharedModules b/SharedModules
index e0af2622a..891ef2ecc 160000
--- a/SharedModules
+++ b/SharedModules
@@ -1 +1 @@
-Subproject commit e0af2622a57952b049bcb47ddf31540560658ab2
+Subproject commit 891ef2ecc8c93c03ef876b514fe9552202da276b
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
index b6c18c316..e7ab1fe5e 100644
--- a/common/src/main/AndroidManifest.xml
+++ b/common/src/main/AndroidManifest.xml
@@ -14,6 +14,8 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.ACTION_MANAGE_OVERLAY_PERMISSION" />
     <!-- <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" /> -->
+    <!-- Android 9+: needed to run package uninstaller (ATV, Amazon bride) -->
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES"/>
 
     <!-- Android 11+: fix access package info -->
     <queries>
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/ATVBridgePresenter.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/ATVBridgePresenter.java
index 7e0b56373..79b555ef6 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/ATVBridgePresenter.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/ATVBridgePresenter.java
@@ -4,7 +4,12 @@ import android.content.Context;
 import com.liskovsoft.sharedutils.helpers.Helpers;
 
 public class ATVBridgePresenter extends BridgePresenter {
-    private static final Integer[] ATV_YOUTUBE_PKG_HASH = {1430778939, -672009692, -798407885, -593272746};
+    private static final Integer[] ATV_YOUTUBE_PKG_HASH = {
+            //1430778939, // Armanych
+            -672009692,
+            -798407885,
+            -593272746
+    };
     private static final String ATV_YOUTUBE_PKG_NAME = "com.google.android.youtube.tv";
     private static final String ATV_BRIDGE_PKG_URL = "https://github.com/yuliskov/SmartTubeNext/releases/download/latest/ATV_Bridge.apk";
     private static ATVBridgePresenter sInstance;
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/AmazonBridgePresenter.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/AmazonBridgePresenter.java
index 5c8c571e1..b0151e986 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/AmazonBridgePresenter.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/AmazonBridgePresenter.java
@@ -4,7 +4,12 @@ import android.content.Context;
 import com.liskovsoft.sharedutils.helpers.Helpers;
 
 public class AmazonBridgePresenter extends BridgePresenter {
-    private static final Integer[] AMAZON_YOUTUBE_PKG_HASH = {1430778939, -672009692, -798407885, -593272746};
+    private static final Integer[] AMAZON_YOUTUBE_PKG_HASH = {
+            //1430778939, // Armanych
+            -672009692,
+            -798407885,
+            -593272746
+    };
     private static final String AMAZON_YOUTUBE_PKG_NAME = "com.amazon.firetv.youtube";
     private static final String AMAZON_BRIDGE_PKG_URL = "https://github.com/yuliskov/SmartTubeNext/releases/download/latest/Amazon_Bridge.apk";
     private static AmazonBridgePresenter sInstance;
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/BridgePresenter.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/BridgePresenter.java
index 806796d0b..800f88aac 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/BridgePresenter.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/BridgePresenter.java
@@ -10,6 +10,7 @@ import android.net.Uri;
 import com.liskovsoft.appupdatechecker2.other.downloadmanager.DownloadManagerTask;
 import com.liskovsoft.appupdatechecker2.other.downloadmanager.DownloadManagerTask.DownloadListener;
 import com.liskovsoft.sharedutils.helpers.Helpers;
+import com.liskovsoft.sharedutils.helpers.MessageHelpers;
 import com.liskovsoft.sharedutils.mylogger.Log;
 import com.liskovsoft.smartyoutubetv2.common.R;
 import com.liskovsoft.smartyoutubetv2.common.app.models.playback.ui.OptionItem;
@@ -95,7 +96,7 @@ abstract class BridgePresenter extends BasePresenter<Void> implements MotherActi
     private boolean isOldApkInstalled() {
         PackageInfo info = getPackageSignature(getPackageName());
 
-        return Helpers.isUserApp(info) && !Helpers.equalsAny(info.signatures[0].hashCode(), getPackageSignatureHash());
+        return info != null && !Helpers.equalsAny(info.signatures[0].hashCode(), getPackageSignatureHash());
     }
 
     private PackageInfo getPackageSignature(String pkgName) {
@@ -126,6 +127,8 @@ abstract class BridgePresenter extends BasePresenter<Void> implements MotherActi
     public void onResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == Helpers.REMOVE_PACKAGE_CODE && !isOldApkInstalled()) {
             installBridgeFromPath(getContext());
+        } else {
+            MessageHelpers.showMessage(getContext(), "The package " + getPackageName() + " cannot be uninstalled!");
         }
     }