diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in
index 563914fb02c..f1047ac41d8 100644
--- a/java/AndroidManifest.xml.in
+++ b/java/AndroidManifest.xml.in
@@ -31,7 +31,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
 	  android:versionName="@version@">
 
   <!-- Paste in every permission in existence so Emacs can do
-       anything.  -->
+       everything.  -->
 
   <uses-permission android:name="android.permission.READ_CONTACTS" />
   <uses-permission android:name="android.permission.WRITE_CONTACTS" />
@@ -95,8 +95,6 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
   <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
   <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
   <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
-  <uses-permission android:name="android.permission.READ_SMS" />
-  <uses-permission android:name="android.permission.RECEIVE_MMS" />
   <uses-permission android:name="android.permission.RECEIVE_WAP_PUSH" />
   <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
   <uses-permission android:name="android.permission.SMS_FINANCIAL_TRANSACTIONS" />
@@ -185,7 +183,6 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
   <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
   <uses-permission android:name="android.permission.USE_FINGERPRINT" />
   <uses-permission android:name="android.permission.WRITE_PROFILE" />
-  <uses-permission android:name="android.permission.WRITE_SMS" />
   <uses-permission android:name="android.permission.WRITE_SOCIAL_STREAM" />
   <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
   <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" />
diff --git a/java/org/gnu/emacs/EmacsWindowManager.java b/java/org/gnu/emacs/EmacsWindowManager.java
index a239fdc8ac2..41ea3a15809 100644
--- a/java/org/gnu/emacs/EmacsWindowManager.java
+++ b/java/org/gnu/emacs/EmacsWindowManager.java
@@ -221,11 +221,14 @@ public final class EmacsWindowManager
       {
 	consumer.detachWindow ();
 
-	/* Though pruneWindows will likely remove the same windows, call
-	   onActivityDetached anyway if isFinishing is set, as in
-	   obscure circumstances pruneWindows will not remove frames
-	   bound to the system-started task.  */
-	if (isFinishing)
+	/* Though pruneWindows will likely remove the same window(s),
+	   call onActivityDetached anyway if isFinishing is set, if
+	   CONSUMER not be a multitasking activity, as in obscure
+	   circumstances pruneWindows will not remove frames bound to
+	   the system-started task.  */
+	if (isFinishing
+	    && (!(consumer instanceof EmacsMultitaskActivity)
+		|| Build.VERSION.SDK_INT < Build.VERSION_CODES.Q))
 	  window.onActivityDetached ();
       }