Attach root before dismissing modal

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java

@@ -183,18 +183,8 @@ public class Navigator extends ParentController {
     }
 
     public void dismissModal(final String componentId, CommandListener listener) {
-        modalStack.dismissModal(componentId, new CommandListener() {
-            @Override
-            public void onSuccess(String childId) {
-                if (modalStack.size() == 0) contentLayout.addView(root.getView());
-                listener.onSuccess(childId);
-            }
-
-            @Override
-            public void onError(String message) {
-                listener.onError(message);
-            }
-        });
+        if (modalStack.size() == 1) contentLayout.addView(root.getView());
+        modalStack.dismissModal(componentId, listener);
     }
 
     public void dismissAllModals(CommandListener listener) {

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java

@@ -412,6 +412,22 @@ public class NavigatorTest extends BaseTest {
         verify(parentController, times(2)).onViewAppeared();
     }
 
+    @Test
+    public void dismissModal_rootIsAttachedBeforeModalIsDismissed() {
+        disableShowModalAnimation(child1, child2);
+        disableDismissModalAnimation(child2);
+
+        uut.setRoot(parentController, new MockPromise());
+        uut.showModal(child1, new CommandListenerAdapter());
+        uut.showModal(child2, new CommandListenerAdapter());
+
+        uut.dismissModal(child2.getId(), new CommandListenerAdapter());
+        assertThat(parentController.getView().getParent()).isNull();
+
+        uut.dismissModal(child1.getId(), new CommandListenerAdapter());
+        assertThat(parentController.getView().getParent()).isNotNull();
+    }
+
     @Test
     public void dismissAllModals_onViewAppearedInvokedOnRoot() {
         disableShowModalAnimation(child1);