diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 568100fb0..050a044d1 100644
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -106,7 +106,7 @@ gradle.projectsEvaluated {
                 '--reset-cache')
 
             // Disable bundling on dev builds
-            //enabled !devEnabled
+            enabled !devEnabled
         }
 
         // Hook bundle${productFlavor}${buildType}JsAndAssets into the android build process
diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
index b7234a0a8..d24f796a2 100644
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
@@ -39,11 +39,11 @@ import java.net.URL;
  */
 public class JitsiMeetActivity extends AppCompatActivity {
     /**
-     * Code for identifying the permission to draw on top of other apps. The
-     * number is chosen arbitrarily and used to correlate the intent with its
-     * result.
+     * The request code identifying requests for the permission to draw on top
+     * of other apps. The value must be 16-bit and is arbitrarily chosen here. 
      */
-    public static final int OVERLAY_PERMISSION_REQ_CODE = 4242;
+    private static final int OVERLAY_PERMISSION_REQUEST_CODE
+        = (int) (Math.random() * Short.MAX_VALUE);
 
     /**
      * Instance of the {@link JitsiMeetView} which this activity will display.
@@ -56,6 +56,14 @@ public class JitsiMeetActivity extends AppCompatActivity {
      */
     private boolean welcomePageEnabled;
 
+    private boolean canRequestOverlayPermission() {
+        return
+            BuildConfig.DEBUG
+                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                && getApplicationInfo().targetSdkVersion
+                    >= Build.VERSION_CODES.M;
+    }
+
     /**
      *
      * @see JitsiMeetView#getWelcomePageEnabled
@@ -64,6 +72,22 @@ public class JitsiMeetActivity extends AppCompatActivity {
         return view == null ? welcomePageEnabled : view.getWelcomePageEnabled();
     }
 
+    /**
+     * Initializes the {@link #view} of this {@code JitsiMeetActivity} with a
+     * new {@link JitsiMeetView} instance.
+     */
+    private void initializeView() {
+        view = new JitsiMeetView(this);
+
+        // In order to have the desired effect
+        // JitsiMeetView#setWelcomePageEnabled(boolean) must be invoked before
+        // JitsiMeetView#loadURL(URL).
+        view.setWelcomePageEnabled(welcomePageEnabled);
+        view.loadURL(null);
+
+        setContentView(view);
+    }
+
     /**
      * Loads the given URL and displays the conference. If the specified URL is
      * null, the welcome page is displayed instead.
@@ -82,15 +106,11 @@ public class JitsiMeetActivity extends AppCompatActivity {
             int requestCode,
             int resultCode,
             Intent data) {
-        if (requestCode == OVERLAY_PERMISSION_REQ_CODE) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                if (!Settings.canDrawOverlays(this)) {
-                    // Permission not granted.
-                    return;
-                }
+        if (requestCode == OVERLAY_PERMISSION_REQUEST_CODE
+                && canRequestOverlayPermission()) {
+            if (Settings.canDrawOverlays(this)) {
+                initializeView();
             }
-
-            setupView();
         }
     }
 
@@ -112,21 +132,19 @@ public class JitsiMeetActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // In debug mode React needs permission to write over other apps in
+        // In Debug builds React needs permission to write over other apps in
         // order to display the warning and error overlays.
-        if (BuildConfig.DEBUG
-                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                && !Settings.canDrawOverlays(this)) {
+        if (canRequestOverlayPermission() && !Settings.canDrawOverlays(this)) {
             Intent intent
                 = new Intent(
                         Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
                         Uri.parse("package:" + getPackageName()));
 
-            startActivityForResult(intent, OVERLAY_PERMISSION_REQ_CODE);
+            startActivityForResult(intent, OVERLAY_PERMISSION_REQUEST_CODE);
             return;
         }
 
-        setupView();
+        initializeView();
     }
 
     /**
@@ -167,18 +185,6 @@ public class JitsiMeetActivity extends AppCompatActivity {
         JitsiMeetView.onHostResume(this);
     }
 
-    private void setupView() {
-        view = new JitsiMeetView(this);
-
-        // In order to have the desired effect
-        // JitsiMeetView#setWelcomePageEnabled(boolean) must be invoked before
-        // JitsiMeetView#loadURL(URL).
-        view.setWelcomePageEnabled(welcomePageEnabled);
-        view.loadURL(null);
-
-        setContentView(view);
-    }
-
     /**
      *
      * @see JitsiMeetView#setWelcomePageEnabled
diff --git a/react/features/base/media/reducer.js b/react/features/base/media/reducer.js
index e673d7a2b..0fe96f2c8 100644
--- a/react/features/base/media/reducer.js
+++ b/react/features/base/media/reducer.js
@@ -63,9 +63,9 @@ function _audio(state = AUDIO_INITIAL_MEDIA_STATE, action) {
  * @type {VideoMediaState}
  */
 const VIDEO_INITIAL_MEDIA_STATE = {
+    available: true,
     facingMode: CAMERA_FACING_MODE.USER,
-    muted: true,
-    available: true
+    muted: false
 };
 
 /**