Merge branch 'main' into field_type_subscription_ui

assets/javascripts/discourse/routes/custom-wizard-step.js.es6

@@ -1,6 +1,8 @@
 import I18n from "I18n";
 import { getCachedWizard } from "../models/custom-wizard";
 import Route from "@ember/routing/route";
+import { scrollTop } from "discourse/mixins/scroll-top";
+import { action } from "@ember/object";
 
 export default Route.extend({
   beforeModel() {
@@ -48,4 +50,10 @@ export default Route.extend({
 
     controller.setProperties(props);
   },
+
+  @action
+  didTransition() {
+    scrollTop();
+    return true;
+  },
 });