diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 946406175..0f4e9b3bc 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -52,7 +52,7 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <!-- Needed for kill application yourself -->
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
-
+    <uses-feature android:name="android.hardware.camera.autofocus" />
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
diff --git a/src/android/org/linphone/assistant/QrcodeFragment.java b/src/android/org/linphone/assistant/QrcodeFragment.java
index 140287d05..a779a39c6 100644
--- a/src/android/org/linphone/assistant/QrcodeFragment.java
+++ b/src/android/org/linphone/assistant/QrcodeFragment.java
@@ -113,7 +113,7 @@ public class QrcodeFragment extends Fragment {
 		launchQrcodeReader();
 		if (androidVideoWindowImpl != null) {
 			synchronized (androidVideoWindowImpl) {
-				LinphoneManager.getLc().setNativePreviewWindowId(androidVideoWindowImpl);
+				//LinphoneManager.getLc().setNativePreviewWindowId(androidVideoWindowImpl);
 			}
 		}
 		super.onResume();
@@ -123,11 +123,11 @@ public class QrcodeFragment extends Fragment {
 	public void onPause() {
 		if (androidVideoWindowImpl != null) {
 			synchronized (androidVideoWindowImpl) {
-				LinphoneManager.getLc().setNativePreviewWindowId(null);
+				//LinphoneManager.getLc().setNativePreviewWindowId(null);
 			}
 		}
 		enableQrcodeReader(false);
-		setBackCamera(false);
+		//setBackCamera(false);
 		super.onPause();
 	}
 
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index 1e53888bb..89e89db48 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit 1e53888bb49135c528a0bb32494bfb5ceaddb5f8
+Subproject commit 89e89db483137c1bb65d30c2ecd9c1667a43dae1