Handle a route being dismissed before being popped

Ensure that if a route's performance is dismissed before the route is
popped, that we pop the route.