diff --git a/app/src/main/java/org/linphone/utils/AndroidAudioManager.java b/app/src/main/java/org/linphone/utils/AndroidAudioManager.java
index efe6f9c85..8875b0501 100644
--- a/app/src/main/java/org/linphone/utils/AndroidAudioManager.java
+++ b/app/src/main/java/org/linphone/utils/AndroidAudioManager.java
@@ -65,6 +65,7 @@ public class AndroidAudioManager {
     private BluetoothHeadset mBluetoothHeadset;
     private BluetoothReceiver mBluetoothReceiver;
     private HeadsetReceiver mHeadsetReceiver;
+    private boolean mHeadsetReceiverRegistered;
 
     private boolean mIsRinging;
     private boolean mAudioFocused;
@@ -79,6 +80,7 @@ public class AndroidAudioManager {
         mAudioManager = ((AudioManager) context.getSystemService(Context.AUDIO_SERVICE));
         mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
         mEchoTesterIsRunning = false;
+        mHeadsetReceiverRegistered = false;
 
         startBluetooth();
 
@@ -131,6 +133,7 @@ public class AndroidAudioManager {
                                     }
                                 }
                                 // Only register this one when a call is active
+
                                 enableHeadsetReceiver();
                             }
                         } else if (state == Call.State.End || state == Call.State.Error) {
@@ -148,9 +151,10 @@ public class AndroidAudioManager {
                                 }
 
                                 // Only register this one when a call is active
-                                if (mHeadsetReceiver != null) {
+                                if (mHeadsetReceiver != null && mHeadsetReceiverRegistered) {
                                     Log.i("[Audio Manager] Unregistering headset receiver");
                                     mContext.unregisterReceiver(mHeadsetReceiver);
+                                    mHeadsetReceiverRegistered = false;
                                 }
 
                                 TelephonyManager tm =
@@ -595,5 +599,6 @@ public class AndroidAudioManager {
                 mHeadsetReceiver, new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY));
         mContext.registerReceiver(
                 mHeadsetReceiver, new IntentFilter(AudioManager.ACTION_HEADSET_PLUG));
+        mHeadsetReceiverRegistered = true;
     }
 }
diff --git a/app/src/main/res/layout-land/call.xml b/app/src/main/res/layout-land/call.xml
index d82cc1a5e..b47c08bba 100644
--- a/app/src/main/res/layout-land/call.xml
+++ b/app/src/main/res/layout-land/call.xml
@@ -20,7 +20,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
 
-            <org.linphone.core.tools.AutoFitTextureView
+            <org.linphone.mediastream.video.capture.CaptureTextureView
                 android:id="@+id/local_preview_texture"
                 android:layout_width="200dp"
                 android:layout_height="200dp"
diff --git a/app/src/main/res/layout/call.xml b/app/src/main/res/layout/call.xml
index 286498dc6..d484a5ae3 100644
--- a/app/src/main/res/layout/call.xml
+++ b/app/src/main/res/layout/call.xml
@@ -20,7 +20,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
 
-            <org.linphone.core.tools.AutoFitTextureView
+            <org.linphone.mediastream.video.capture.CaptureTextureView
                 android:id="@+id/local_preview_texture"
                 android:layout_width="200dp"
                 android:layout_height="200dp"