Merge pull request #1490 from Hixie/navigator-ensure-pop Handle a route being dismissed before being popped