Fixed ordering of router events when using navigations