Also changed the structure used to store Modals from a Map based on navigatorId to a stack. Reason for the change is that screens can be pushed only to the topmost Modal.