Depending on how this issue would be resolved I'd rather not merge a change that results in people experiencing JENKINS-34174 having absolutely no way out of the dialog (and navigating away does not remove it from the root URL). Unfortunately we have no data to go by how common the problem reported there is, but ecen if it's only a moderate number of users affected, just getting rid of the 'x' seems like a step backwards.

Related: JENKINS-34007

Code changed in jenkins
User: kzantow
Path:
war/src/main/js/pluginSetupWizardGui.js
war/src/main/js/templates/pluginSelectionPanel.hbs
war/src/main/js/templates/welcomePanel.hbs
http://jenkins-ci.org/commit/jenkins/d0f5c2b074ab0776bf9605ccbdbe0475c72c1041
Log:
JENKINS-34137 - better handling of the close button: not allowed while
plugins installing or in certain other places, close now directs to
setup complete panel, with message about skipping admin user creation

Code changed in jenkins
User: kzantow
Path:
Jenkinsfile
changelog.html
cli/pom.xml
cli/src/main/java/hudson/cli/CLI.java
core/pom.xml
core/src/main/java/hudson/ClassicPluginStrategy.java
core/src/main/java/hudson/Functions.java
core/src/main/java/hudson/PluginManager.java
core/src/main/java/hudson/PluginWrapper.java
core/src/main/java/hudson/Util.java
core/src/main/java/hudson/model/Action.java
core/src/main/java/hudson/model/ManagementLink.java
core/src/main/java/hudson/model/TopLevelItemDescriptor.java
core/src/main/java/hudson/model/UpdateCenter.java
core/src/main/java/hudson/model/UpdateSite.java
core/src/main/java/hudson/model/User.java
core/src/main/java/hudson/model/View.java
core/src/main/java/hudson/model/ViewDescriptor.java
core/src/main/java/jenkins/ClassLoaderReflectionToolkit.java
core/src/main/java/jenkins/model/Jenkins.java
core/src/main/java/jenkins/model/RunIdMigrator.java
core/src/main/resources/jenkins/management/Messages_lt.properties
core/src/main/resources/jenkins/model/Messages_lt.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_lt.properties
core/src/main/resources/jenkins/triggers/Messages_lt.properties
core/src/test/java/jenkins/xml/XMLUtilsTest.java
pom.xml
test/pom.xml
test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java
test/src/test/java/hudson/model/ManagementLinkTest.java
war/pom.xml
http://jenkins-ci.org/commit/jenkins/1c39655f564733c06e7c9eb0c3859ba890b7b7bc
Log:
Merge remote-tracking branch 'primary/master' into JENKINS-34137-smarter-setup-wizard-close

Code changed in jenkins
User: Daniel Beck
Path:
war/src/main/js/pluginSetupWizardGui.js
war/src/main/js/templates/pluginSelectionPanel.hbs
war/src/main/js/templates/welcomePanel.hbs
http://jenkins-ci.org/commit/jenkins/5d90f816566aed1d60e77409c722f4e652f3040a
Log:
Merge pull request #2259 from kzantow/JENKINS-34137-smarter-setup-wizard-close

JENKINS-34137 setup wizard: better handling of the close button