Fixed some issues with pushing in tabs

android/app/src/main/java/com/reactnativenavigation/activities/BottomTabActivity.java

@@ -103,11 +103,14 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
     @Override
     public Screen pop(String navigatorId) {
         super.pop(navigatorId);
-        Screen screen = mScreenStacks.get(mCurrentStackPosition).pop();
-        Screen currentScreen = getCurrentScreen();
-        setNavigationStyle(currentScreen);
-        mToolbar.update(currentScreen);
-        return screen;
+        for (ScreenStack stack: mScreenStacks) {
+            if (stack.peek().navigatorId.equals(navigatorId)) {
+                Screen popped = stack.pop();
+                setNavigationStyle(getCurrentScreen());
+                return popped;
+            }
+        }
+        return null;
     }
 
     @Override

android/app/src/main/java/com/reactnativenavigation/modal/RnnModal.java

@@ -67,13 +67,12 @@ public class RnnModal extends Dialog implements DialogInterface.OnDismissListene
     }
 
     public Screen pop() {
+        Screen popped = mScreenStack.pop();
         if (mScreenStack.isEmpty()) {
             ModalController.getInstance().remove();
-            super.onBackPressed();
-            return null;
-        } else {
-            return mScreenStack.pop();
+            dismiss();
         }
+        return popped;
     }
 
     @Override

android/app/src/main/java/com/reactnativenavigation/modules/RctActivityModule.java

@@ -144,14 +144,15 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
                 });
             }
             return;
+        } else {
+            context.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    context.pop(navigatorId);
+                }
+            });
         }
 
-        context.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                context.pop(navigatorId);
-            }
-        });
     }
 
     @ReactMethod