Merge branch 'master' into upgrade

android/app/src/main/java/com/reactnativenavigation/react/NavigationReactGateway.java

@@ -74,7 +74,8 @@ public class NavigationReactGateway implements ReactGateway {
     }
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        getReactInstanceManager().onActivityResult(requestCode, resultCode, data);
+        Activity currentActivity = getReactInstanceManager().getCurrentReactContext().getCurrentActivity();
+        getReactInstanceManager().onActivityResult(currentActivity, requestCode, resultCode, data);
     }
 
     public ReactNativeHost getReactNativeHost() {

src/deprecated/platformSpecificDeprecated.ios.js

@@ -184,10 +184,10 @@ function _mergeScreenSpecificSettings(screenID, screenInstanceID, params) {
     Object.assign(navigatorStyle, params.navigatorStyle);
   }
 
-  const navigatorEventID = screenInstanceID + '_events';
-  const navigatorButtons = Object.assign({}, screenClass.navigatorButtons);
+  let navigatorEventID = screenInstanceID + '_events';
+  let navigatorButtons = JSON.parse(JSON.stringify(screenClass.navigatorButtons));
   if (params.navigatorButtons) {
-    Object.assign(navigatorButtons, params.navigatorButtons);
+    navigatorButtons = JSON.parse(JSON.stringify(params.navigatorButtons));
   }
   if (navigatorButtons.leftButtons) {
     for (let i = 0; i < navigatorButtons.leftButtons.length; i++) {