Merge "Don't allow settings launch when user isn't setup" into oc-dev