Really always include the confirm step preference

Fixes #3945

Conflicts:
	frontend/spec/features/checkout_spec.rb