fix(scenario manager): add missing @Nonnull annotations