diff --git a/app/build.gradle b/app/build.gradle
index 872f0d11e..210798848 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -155,6 +155,18 @@ android {
         releaseAppBundle {
             initWith release
             ndk.debugSymbolLevel = 'FULL'
+
+            if (crashlyticsEnabled()) {
+                resValue "bool", "crashlytics_enabled", "true"
+
+                firebaseCrashlytics {
+                    nativeSymbolUploadEnabled true
+                    strippedNativeLibsDir file(LinphoneSdkBuildDir + '/libs/').toString()
+                    unstrippedNativeLibsDir file(LinphoneSdkBuildDir + '/libs-debug/').toString()
+                }
+            } else {
+                resValue "bool", "crashlytics_enabled", "false"
+            }
         }
 
         debug {
@@ -293,5 +305,8 @@ if (crashlyticsEnabled()) {
     afterEvaluate {
         assembleDebug.finalizedBy(uploadCrashlyticsSymbolFileDebug)
         packageDebugBundle.finalizedBy(uploadCrashlyticsSymbolFileDebug)
+
+        assembleReleaseAppBundle.finalizedBy(uploadCrashlyticsSymbolFileReleaseAppBundle)
+        packageReleaseAppBundleBundle.finalizedBy(uploadCrashlyticsSymbolFileReleaseAppBundle)
     }
 }
diff --git a/app/src/main/java/org/linphone/activities/main/MainActivity.kt b/app/src/main/java/org/linphone/activities/main/MainActivity.kt
index 6148be565..ed2b1953b 100644
--- a/app/src/main/java/org/linphone/activities/main/MainActivity.kt
+++ b/app/src/main/java/org/linphone/activities/main/MainActivity.kt
@@ -46,7 +46,6 @@ import org.linphone.R
 import org.linphone.activities.GenericActivity
 import org.linphone.activities.SnackBarActivity
 import org.linphone.activities.assistant.AssistantActivity
-import org.linphone.activities.call.CallActivity
 import org.linphone.activities.main.viewmodels.CallOverlayViewModel
 import org.linphone.activities.main.viewmodels.SharedMainViewModel
 import org.linphone.activities.navigateToDialer
@@ -110,12 +109,6 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
             }
         })
 
-        binding.setGoBackToCallClickListener {
-            val intent = Intent(this, CallActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
-            startActivity(intent)
-        }
-
         if (coreContext.core.accountList.isEmpty()) {
             if (corePreferences.firstStart) {
                 corePreferences.firstStart = false
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 46e3e268f..0e0a2101d 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -4,9 +4,6 @@
 
     <data>
         <import type="android.view.View" />
-        <variable
-            name="goBackToCallClickListener"
-            type="android.view.View.OnClickListener" />
         <variable
             name="viewModel"
             type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />