Navigator searches for controllers in OverlayManager as well

Fixes #4225

lib/android/app/src/main/java/com/reactnativenavigation/presentation/OverlayManager.java

@@ -37,4 +37,8 @@ public class OverlayManager {
     public int size() {
         return overlayRegistry.size();
     }
+
+    public ViewController findControllerById(String id) {
+        return overlayRegistry.get(id);
+    }
 }

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

@@ -196,7 +196,13 @@ public class Navigator extends ParentController {
     @Override
     public ViewController findController(String id) {
         ViewController controllerById = super.findController(id);
-        return controllerById != null ? controllerById : modalStack.findControllerById(id);
+        if (controllerById == null) {
+            controllerById = modalStack.findControllerById(id);
+        }
+        if (controllerById == null) {
+            controllerById = overlayManager.findControllerById(id);
+        }
+        return controllerById;
     }
 
     private void applyOnStack(String fromId, CommandListener listener, Task<StackController> task) {
@@ -217,7 +223,7 @@ public class Navigator extends ParentController {
     }
 
     @RestrictTo(RestrictTo.Scope.TESTS)
-    public FrameLayout getModalsLayout() {
+    FrameLayout getModalsLayout() {
         return modalsLayout;
     }
 }

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

@@ -71,7 +71,7 @@ public class NavigatorTest extends BaseTest {
     public void beforeEach() {
         childRegistry = new ChildControllersRegistry();
         eventEmitter = Mockito.mock(EventEmitter.class);
-        overlayManager = Mockito.mock(OverlayManager.class);
+        overlayManager = spy(new OverlayManager());
         imageLoaderMock = ImageLoaderMock.mock();
         activityController = newActivityController(TestActivity.class);
         activity = activityController.create().get();
@@ -349,6 +349,24 @@ public class NavigatorTest extends BaseTest {
         return new BottomTabsController(activity, tabs, childRegistry, eventEmitter, imageLoaderMock, "tabsController", new Options(), new Presenter(activity, new Options()), new BottomTabsPresenter(tabs, new Options()), new BottomTabPresenter(activity, tabs, ImageLoaderMock.mock(), new Options()));
     }
 
+    @Test
+    public void findController_root() {
+        uut.setRoot(child1, new CommandListenerAdapter());
+        assertThat(uut.findController(child1.getId())).isEqualTo(child1);
+    }
+
+    @Test
+    public void findController_overlay() {
+        uut.showOverlay(child1, new CommandListenerAdapter());
+        assertThat(uut.findController(child1.getId())).isEqualTo(child1);
+    }
+
+    @Test
+    public void findController_modal() {
+        uut.showModal(child1, new CommandListenerAdapter());
+        assertThat(uut.findController(child1.getId())).isEqualTo(child1);
+    }
+
     @NonNull
     private StackController newStack() {
         StackController stack = TestUtils.newStackController(activity)
@@ -588,7 +606,7 @@ public class NavigatorTest extends BaseTest {
     public void destroy_destroyOverlayManager() {
         uut.setRoot(parentController, new CommandListenerAdapter());
         activityController.destroy();
-        verify(overlayManager, times(1)).destroy();
+        verify(overlayManager).destroy();
     }
 
     @Test