diff --git a/app/src/main/java/org/linphone/compatibility/Api31Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api31Compatibility.kt
index f225df602..457e3c60e 100644
--- a/app/src/main/java/org/linphone/compatibility/Api31Compatibility.kt
+++ b/app/src/main/java/org/linphone/compatibility/Api31Compatibility.kt
@@ -262,6 +262,8 @@ class Api31Compatibility {
                 context.startForegroundService(intent)
             } catch (fssnae: ForegroundServiceStartNotAllowedException) {
                 Log.e("[Api31 Compatibility] Can't start service as foreground! $fssnae")
+            } catch (se: SecurityException) {
+                Log.e("[Api31 Compatibility] Can't start service as foreground! $se")
             }
         }
 
@@ -270,6 +272,8 @@ class Api31Compatibility {
                 service.startForeground(notifId, notif)
             } catch (fssnae: ForegroundServiceStartNotAllowedException) {
                 Log.e("[Api31 Compatibility] Can't start service as foreground! $fssnae")
+            } catch (se: SecurityException) {
+                Log.e("[Api31 Compatibility] Can't start service as foreground! $se")
             }
         }
 
diff --git a/app/src/main/res/layout/voip_single_call_fragment.xml b/app/src/main/res/layout/voip_single_call_fragment.xml
index 54aa2252e..7b088e11e 100644
--- a/app/src/main/res/layout/voip_single_call_fragment.xml
+++ b/app/src/main/res/layout/voip_single_call_fragment.xml
@@ -222,18 +222,12 @@
                 app:layout_constraintEnd_toEndOf="@id/background"
                 app:layout_constraintTop_toTopOf="@id/background" />
 
-            <androidx.constraintlayout.widget.Group
-                android:id="@+id/video_preview_group"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; !callsViewModel.currentCallData.isRemotelyPaused &amp;&amp; !callsViewModel.currentCallData.isPaused ? View.VISIBLE : View.GONE}"
-                app:constraint_referenced_ids="local_preview_video_surface,switch_camera" />
-
             <org.linphone.activities.voip.views.RoundCornersTextureView
                 android:id="@+id/local_preview_video_surface"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:layout_size="@{controlsViewModel.pipMode ? @dimen/video_preview_pip_max_size : @dimen/video_preview_max_size}"
+                android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; !callsViewModel.currentCallData.isRemotelyPaused &amp;&amp; !callsViewModel.currentCallData.isPaused ? View.VISIBLE : View.GONE}"
                 app:alignTopRight="true"
                 app:displayMode="black_bars"
                 app:layout_constraintBottom_toTopOf="@id/bottom_barrier"
@@ -251,7 +245,7 @@
                 android:onClick="@{() -> controlsViewModel.switchCamera()}"
                 android:padding="10dp"
                 android:src="@drawable/icon_call_camera_switch"
-                android:visibility="@{controlsViewModel.isSwitchCameraAvailable &amp;&amp; !controlsViewModel.pipMode ? View.VISIBLE : View.GONE, default=gone}"
+                android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; !callsViewModel.currentCallData.isRemotelyPaused &amp;&amp; !callsViewModel.currentCallData.isPaused &amp;&amp; controlsViewModel.isSwitchCameraAvailable &amp;&amp; !controlsViewModel.pipMode ? View.VISIBLE : View.GONE, default=gone}"
                 app:layout_constraintEnd_toEndOf="@id/local_preview_video_surface"
                 app:layout_constraintTop_toTopOf="@id/local_preview_video_surface" />