Bug 1009535 - [FTU] Fix navigation step logic