diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index b6211ddeb4..2b4d957491 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -120,3 +120,10 @@
 -keep class org.mozilla.javascript.** { *; }
 -keep class org.mozilla.classfile.ClassFileWriter
 -dontwarn org.mozilla.javascript.tools.**
+
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn java.beans.BeanDescriptor
+-dontwarn java.beans.BeanInfo
+-dontwarn java.beans.IntrospectionException
+-dontwarn java.beans.Introspector
+-dontwarn java.beans.PropertyDescriptor
\ No newline at end of file
diff --git a/app/release/baselineProfiles/0/app-arm64-v8a-release.dm b/app/release/baselineProfiles/0/app-arm64-v8a-release.dm
new file mode 100644
index 0000000000..3663af4a8a
Binary files /dev/null and b/app/release/baselineProfiles/0/app-arm64-v8a-release.dm differ
diff --git a/app/release/baselineProfiles/0/app-armeabi-v7a-release.dm b/app/release/baselineProfiles/0/app-armeabi-v7a-release.dm
new file mode 100644
index 0000000000..3663af4a8a
Binary files /dev/null and b/app/release/baselineProfiles/0/app-armeabi-v7a-release.dm differ
diff --git a/app/release/baselineProfiles/0/app-universal-release.dm b/app/release/baselineProfiles/0/app-universal-release.dm
new file mode 100644
index 0000000000..3663af4a8a
Binary files /dev/null and b/app/release/baselineProfiles/0/app-universal-release.dm differ
diff --git a/app/release/baselineProfiles/0/app-x86-release.dm b/app/release/baselineProfiles/0/app-x86-release.dm
new file mode 100644
index 0000000000..3663af4a8a
Binary files /dev/null and b/app/release/baselineProfiles/0/app-x86-release.dm differ
diff --git a/app/release/baselineProfiles/0/app-x86_64-release.dm b/app/release/baselineProfiles/0/app-x86_64-release.dm
new file mode 100644
index 0000000000..3663af4a8a
Binary files /dev/null and b/app/release/baselineProfiles/0/app-x86_64-release.dm differ
diff --git a/app/release/baselineProfiles/1/app-arm64-v8a-release.dm b/app/release/baselineProfiles/1/app-arm64-v8a-release.dm
new file mode 100644
index 0000000000..e334caed92
Binary files /dev/null and b/app/release/baselineProfiles/1/app-arm64-v8a-release.dm differ
diff --git a/app/release/baselineProfiles/1/app-armeabi-v7a-release.dm b/app/release/baselineProfiles/1/app-armeabi-v7a-release.dm
new file mode 100644
index 0000000000..e334caed92
Binary files /dev/null and b/app/release/baselineProfiles/1/app-armeabi-v7a-release.dm differ
diff --git a/app/release/baselineProfiles/1/app-universal-release.dm b/app/release/baselineProfiles/1/app-universal-release.dm
new file mode 100644
index 0000000000..e334caed92
Binary files /dev/null and b/app/release/baselineProfiles/1/app-universal-release.dm differ
diff --git a/app/release/baselineProfiles/1/app-x86-release.dm b/app/release/baselineProfiles/1/app-x86-release.dm
new file mode 100644
index 0000000000..e334caed92
Binary files /dev/null and b/app/release/baselineProfiles/1/app-x86-release.dm differ
diff --git a/app/release/baselineProfiles/1/app-x86_64-release.dm b/app/release/baselineProfiles/1/app-x86_64-release.dm
new file mode 100644
index 0000000000..e334caed92
Binary files /dev/null and b/app/release/baselineProfiles/1/app-x86_64-release.dm differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index cbf89e8ae0..e5f1ea713c 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
-      "versionCode": 54,
-      "versionName": "0.24.0",
+      "versionCode": 55,
+      "versionName": "0.25.0",
       "outputFile": "app-universal-release.apk"
     },
     {
@@ -24,8 +24,8 @@
         }
       ],
       "attributes": [],
-      "versionCode": 54,
-      "versionName": "0.24.0",
+      "versionCode": 55,
+      "versionName": "0.25.0",
       "outputFile": "app-armeabi-v7a-release.apk"
     },
     {
@@ -33,39 +33,39 @@
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86"
+          "value": "arm64-v8a"
         }
       ],
       "attributes": [],
-      "versionCode": 54,
-      "versionName": "0.24.0",
-      "outputFile": "app-x86-release.apk"
+      "versionCode": 55,
+      "versionName": "0.25.0",
+      "outputFile": "app-arm64-v8a-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86_64"
+          "value": "x86"
         }
       ],
       "attributes": [],
-      "versionCode": 54,
-      "versionName": "0.24.0",
-      "outputFile": "app-x86_64-release.apk"
+      "versionCode": 55,
+      "versionName": "0.25.0",
+      "outputFile": "app-x86-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "arm64-v8a"
+          "value": "x86_64"
         }
       ],
       "attributes": [],
-      "versionCode": 54,
-      "versionName": "0.24.0",
-      "outputFile": "app-arm64-v8a-release.apk"
+      "versionCode": 55,
+      "versionName": "0.25.0",
+      "outputFile": "app-x86_64-release.apk"
     }
   ],
   "elementType": "File",
@@ -76,9 +76,9 @@
       "baselineProfiles": [
         "baselineProfiles/1/app-universal-release.dm",
         "baselineProfiles/1/app-armeabi-v7a-release.dm",
+        "baselineProfiles/1/app-arm64-v8a-release.dm",
         "baselineProfiles/1/app-x86-release.dm",
-        "baselineProfiles/1/app-x86_64-release.dm",
-        "baselineProfiles/1/app-arm64-v8a-release.dm"
+        "baselineProfiles/1/app-x86_64-release.dm"
       ]
     },
     {
@@ -87,9 +87,9 @@
       "baselineProfiles": [
         "baselineProfiles/0/app-universal-release.dm",
         "baselineProfiles/0/app-armeabi-v7a-release.dm",
+        "baselineProfiles/0/app-arm64-v8a-release.dm",
         "baselineProfiles/0/app-x86-release.dm",
-        "baselineProfiles/0/app-x86_64-release.dm",
-        "baselineProfiles/0/app-arm64-v8a-release.dm"
+        "baselineProfiles/0/app-x86_64-release.dm"
       ]
     }
   ],