diff --git a/app/build.gradle b/app/build.gradle
index 9f1db0714..b69ade753 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -179,6 +179,9 @@ dependencies {
     //noinspection GroovyConstructorNamedArguments
     android.defaultConfig.manifestPlaceholders = [appAuthRedirectScheme: 'org.linphone']
 
+    // To be able to parse native crash tombstone and print them with SDK logs the next time the app will start
+    implementation "com.google.protobuf:protobuf-javalite:3.22.3"
+
     //noinspection GradleDynamicVersion
     implementation 'org.linphone:linphone-sdk-android:5.4.+'
 }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt
index 6ae387fc7..bbda2fb67 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt
@@ -101,6 +101,8 @@ class ConversationMediaListFragment : SlidingPaneChildFragment() {
                 return true
             }
         }
+        // This isn't supported by GridLayoutManager, it will crash
+        // layoutManager.stackFromEnd = true
         binding.mediaList.layoutManager = layoutManager
 
         if (binding.mediaList.adapter != adapter) {