Bug 984404 - [FTE] Update navigation progress bar logic ...

...to reflect current step