Merge "Remove extra return value from scenario call to show_router"