Add previous screen at index 0 when popping

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

@@ -105,6 +105,8 @@ public class StackController extends ParentController<StackLayout> {
                 getView().removeView(toRemove.getView());
                 listener.onSuccess(child.getId());
             }
+        } else {
+            listener.onSuccess(child.getId());
         }
     }
 
@@ -138,9 +140,7 @@ public class StackController extends ParentController<StackLayout> {
         final ViewController appearing = stack.peek();
         disappearing.onViewWillDisappear();
         appearing.onViewWillAppear();
-        getView().onChildWillDisappear(disappearing.options, appearing.options, () ->
-                getView().addView(appearing.getView())
-        );
+        getView().onChildWillDisappear(disappearing.options, appearing.options, () -> getView().addView(appearing.getView(), 0));
 
         if (disappearing.options.animated.isTrueOrUndefined()) {
             animator.pop(disappearing.getView(), () -> finishPopping(disappearing, listener));

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

@@ -76,8 +76,10 @@ public class StackControllerTest extends BaseTest {
     @Test
     public void push() {
         assertThat(uut.isEmpty()).isTrue();
-        uut.push(child1, new CommandListenerAdapter());
+        CommandListenerAdapter listener = spy(new CommandListenerAdapter());
+        uut.push(child1, listener);
         assertContainsOnlyId(child1.getId());
+        verify(listener, times(1)).onSuccess(child1.getId());
     }
 
     @Test
@@ -202,7 +204,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void popDoesNothingWhenZeroOrOneChild() {
+    public void pop_doesNothingWhenZeroOrOneChild() {
         assertThat(uut.isEmpty()).isTrue();
         uut.pop(new CommandListenerAdapter());
         assertThat(uut.isEmpty()).isTrue();