Merge branch 'v2.0' of https://github.com/wix/react-native-navigation into v2.0

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
 import android.view.KeyEvent;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
@@ -99,15 +100,9 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
-
         return JsDevReloadHandler.onKeyUp(getCurrentFocus(), keyCode) || super.onKeyUp(keyCode, event);
     }
 
-    @Override
-    public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) {
-        return super.onKeyMultiple(keyCode, repeatCount, event);
-    }
-
     private NavigationReactInstance getNavigationReactInstance() {
         return NavigationApplication.instance.getNavigationReactInstance();
     }

src/deprecated/platformSpecificDeprecated.android.js

@@ -164,8 +164,7 @@ function addNavigatorButtons(screen) {
   // Get image uri from image id
   const rightButtons = screen.rightButtons ? screen.rightButtons : screen.navigatorButtons ?
                                                                    screen.navigatorButtons.rightButtons : null;
-  screen.titleBarButtons = rightButtons;
-  
+
   if (rightButtons) {
     rightButtons.forEach(function(button) {
       if (button.icon) {
@@ -176,6 +175,8 @@ function addNavigatorButtons(screen) {
       }
     });
   }
+
+  screen.titleBarButtons = rightButtons;
 }
 
 function addNavigationStyleParams(screen) {