FORGE-1347: Subflow order now is maintained when navigation changes