am b056d71f: If setupwizard is disabled, don\'t force it to optional

* commit 'b056d71f79b717fb36d375e48c19509900f977d3':
  If setupwizard is disabled, don't force it to optional