(14) Fixed navigation being broken after successive navigation to the current location.
Merge branch 'feature/14-fixing-broken-navigation-in-flow-controller'