Set SideMenu lockMode only if needed

Apparently lockMode conflicts with visibility - If a menu is visible and lockMode locked is applied the menu closes.
Also removed temp code related to workaround introduced for temp sideMenu options (visibility)

lib/android/app/src/main/java/com/reactnativenavigation/parse/Options.java

@@ -1,6 +1,5 @@
 package com.reactnativenavigation.parse;
 
-import com.reactnativenavigation.parse.params.NullBool;
 import com.reactnativenavigation.parse.params.NullNumber;
 import com.reactnativenavigation.parse.params.NullText;
 import com.reactnativenavigation.utils.TypefaceLoader;
@@ -131,11 +130,6 @@ public class Options {
         return this;
     }
 
-    public Options clearSideMenuOptions() {
-        sideMenuRootOptions = new SideMenuRootOptions();
-        return this;
-    }
-
     public Options clearAnimationOptions() {
         animations = new AnimationsOptions();
         return this;
@@ -147,8 +141,6 @@ public class Options {
     }
 
     public Options clearOneTimeOptions() {
-        sideMenuRootOptions.left.visible = new NullBool();
-        sideMenuRootOptions.right.visible = new NullBool();
         bottomTabsOptions.currentTabId = new NullText();
         bottomTabsOptions.currentTabIndex = new NullNumber();
         return this;

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuController.java

@@ -96,9 +96,6 @@ public class SideMenuController extends ParentController<SideMenuRoot> implement
     public void mergeChildOptions(Options options, ViewController child) {
         super.mergeChildOptions(options, child);
         presenter.mergeChildOptions(options.sideMenuRootOptions);
-        performOnParentController(parentController ->
-                ((ParentController) parentController).mergeChildOptions(options.copy().clearSideMenuOptions(), child)
-        );
     }
 
     @Override

lib/android/app/src/main/java/com/reactnativenavigation/views/SideMenu.java

@@ -19,4 +19,10 @@ public class SideMenu extends DrawerLayout {
             Log.w("RNN", "Tried to open sideMenu, but it's not defined");
         }
     }
+
+    @Override
+    public void setDrawerLockMode(int lockMode, int edgeGravity) {
+        int currentLockMode = getDrawerLockMode(edgeGravity);
+        if (currentLockMode != lockMode) super.setDrawerLockMode(lockMode, edgeGravity);
+    }
 }