diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in
index a95b46c3905..ff811ddf3f1 100644
--- a/java/AndroidManifest.xml.in
+++ b/java/AndroidManifest.xml.in
@@ -29,6 +29,8 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
 	  android:targetSandboxVersion="1"
 	  android:installLocation="auto"
 	  android:requestLegacyExternalStorage="true"
+	  android:hasFragileUserData="true"
+	  android:appCategory="productivity"
 	  @ANDROID_SHARED_USER_ID@
 	  @ANDROID_SHARED_USER_NAME@
 	  android:versionCode="30"
@@ -222,6 +224,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
 	      android:taskAffinity="emacs.primary_frame"
 	      android:windowSoftInputMode="adjustResize"
 	      android:exported="true"
+	      android:stateNotNeeded="true"
 	      android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|locale|fontScale">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
@@ -278,6 +281,8 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
 	      android:taskAffinity="emacs.secondary_frame"
 	      android:windowSoftInputMode="adjustResize"
 	      android:exported="true"
+	      android:maxRecents="50"
+	      android:stateNotNeeded="true"
 	      android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|locale|fontScale"/>
 
     <activity android:autoRemoveFromRecents="true"