--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@@ -2991,21 +2991,21 @@ exports.CSS_PROPERTIES = {
       "grid-row-end",
       "grid-row-gap",
       "grid-row-start",
       "grid-template-areas",
       "grid-template-columns",
       "grid-template-rows",
       "height",
       "hyphens",
-      "initial-letter",
       "image-orientation",
       "-moz-image-region",
       "image-rendering",
       "ime-mode",
+      "initial-letter",
       "inline-size",
       "isolation",
       "justify-content",
       "justify-items",
       "justify-self",
       "left",
       "letter-spacing",
       "lighting-color",
@@ -3059,18 +3059,21 @@ exports.CSS_PROPERTIES = {
       "-moz-outline-radius-bottomleft",
       "-moz-outline-radius-bottomright",
       "-moz-outline-radius-topleft",
       "-moz-outline-radius-topright",
       "outline-style",
       "outline-width",
       "overflow-clip-box-block",
       "overflow-clip-box-inline",
+      "overflow-wrap",
       "overflow-x",
       "overflow-y",
+      "overscroll-behavior-x",
+      "overscroll-behavior-y",
       "padding-block-end",
       "padding-block-start",
       "padding-bottom",
       "padding-inline-end",
       "padding-inline-start",
       "padding-left",
       "padding-right",
       "padding-top",
@@ -3083,19 +3086,18 @@ exports.CSS_PROPERTIES = {
       "pointer-events",
       "position",
       "quotes",
       "resize",
       "right",
       "rotate",
       "ruby-align",
       "ruby-position",
+      "scale",
       "scroll-behavior",
-      "overscroll-behavior-x",
-      "overscroll-behavior-y",
       "scroll-snap-coordinate",
       "scroll-snap-destination",
       "scroll-snap-points-x",
       "scroll-snap-points-y",
       "scroll-snap-type-x",
       "scroll-snap-type-y",
       "shape-image-threshold",
       "shape-outside",
@@ -3128,17 +3130,16 @@ exports.CSS_PROPERTIES = {
       "text-justify",
       "text-orientation",
       "text-overflow",
       "text-rendering",
       "text-shadow",
       "-moz-text-size-adjust",
       "-webkit-text-stroke-color",
       "-webkit-text-stroke-width",
-      "scale",
       "text-transform",
       "top",
       "-moz-top-layer",
       "touch-action",
       "transform",
       "transform-box",
       "transform-origin",
       "transform-style",
@@ -3153,23 +3154,22 @@ exports.CSS_PROPERTIES = {
       "-moz-user-select",
       "vector-effect",
       "vertical-align",
       "visibility",
       "white-space",
       "width",
       "will-change",
       "-moz-window-dragging",
+      "-moz-window-opacity",
       "-moz-window-shadow",
-      "-moz-window-opacity",
       "-moz-window-transform",
       "-moz-window-transform-origin",
       "word-break",
       "word-spacing",
-      "overflow-wrap",
       "writing-mode",
       "z-index"
     ],
     "supports": [
       1,
       2,
       4,
       5,
@@ -9507,24 +9507,24 @@ exports.PREFERENCES = [
     "font-optical-sizing",
     "layout.css.font-variations.enabled"
   ],
   [
     "font-variation-settings",
     "layout.css.font-variations.enabled"
   ],
   [
+    "image-orientation",
+    "layout.css.image-orientation.enabled"
+  ],
+  [
     "initial-letter",
     "layout.css.initial-letter.enabled"
   ],
   [
-    "image-orientation",
-    "layout.css.image-orientation.enabled"
-  ],
-  [
     "isolation",
     "layout.css.isolation.enabled"
   ],
   [
     "mix-blend-mode",
     "layout.css.mix-blend-mode.enabled"
   ],
   [
@@ -9539,36 +9539,40 @@ exports.PREFERENCES = [
     "overflow-clip-box-block",
     "layout.css.overflow-clip-box.enabled"
   ],
   [
     "overflow-clip-box-inline",
     "layout.css.overflow-clip-box.enabled"
   ],
   [
-    "rotate",
-    "layout.css.individual-transform.enabled"
-  ],
-  [
-    "scroll-behavior",
-    "layout.css.scroll-behavior.property-enabled"
-  ],
-  [
     "overscroll-behavior",
     "layout.css.overscroll-behavior.enabled"
   ],
   [
     "overscroll-behavior-x",
     "layout.css.overscroll-behavior.enabled"
   ],
   [
     "overscroll-behavior-y",
     "layout.css.overscroll-behavior.enabled"
   ],
   [
+    "rotate",
+    "layout.css.individual-transform.enabled"
+  ],
+  [
+    "scale",
+    "layout.css.individual-transform.enabled"
+  ],
+  [
+    "scroll-behavior",
+    "layout.css.scroll-behavior.property-enabled"
+  ],
+  [
     "scroll-snap-coordinate",
     "layout.css.scroll-snap.enabled"
   ],
   [
     "scroll-snap-destination",
     "layout.css.scroll-snap.enabled"
   ],
   [
@@ -9619,20 +9623,16 @@ exports.PREFERENCES = [
     "-webkit-text-stroke-color",
     "layout.css.prefixes.webkit"
   ],
   [
     "-webkit-text-stroke-width",
     "layout.css.prefixes.webkit"
   ],
   [
-    "scale",
-    "layout.css.individual-transform.enabled"
-  ],
-  [
     "touch-action",
     "layout.css.touch_action.enabled"
   ],
   [
     "transform-box",
     "svg.transform-box.enabled"
   ],
   [

--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -1665,25 +1665,16 @@ CSS_PROP_(
     hyphens,
     Hyphens,
     0,
     "",
     VARIANT_HK,
     kHyphensKTable,
     eStyleAnimType_Discrete)
 CSS_PROP_(
-    initial-letter,
-    initial_letter,
-    InitialLetter,
-    CSS_PROPERTY_PARSE_FUNCTION,
-    "layout.css.initial-letter.enabled",
-    0,
-    nullptr,
-    eStyleAnimType_Discrete)
-CSS_PROP_(
     image-orientation,
     image_orientation,
     ImageOrientation,
     CSS_PROPERTY_VALUE_PARSER_FUNCTION,
     "layout.css.image-orientation.enabled",
     0,
     kImageOrientationKTable,
     eStyleAnimType_Discrete)
@@ -1710,16 +1701,25 @@ CSS_PROP_(
     ime_mode,
     ImeMode,
     0,
     "",
     VARIANT_HK,
     kIMEModeKTable,
     eStyleAnimType_Discrete)
 CSS_PROP_(
+    initial-letter,
+    initial_letter,
+    InitialLetter,
+    CSS_PROPERTY_PARSE_FUNCTION,
+    "layout.css.initial-letter.enabled",
+    0,
+    nullptr,
+    eStyleAnimType_Discrete)
+CSS_PROP_(
     inline-size,
     inline_size,
     InlineSize,
     CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH,
     "",
     VARIANT_AHKLP | VARIANT_CALC,
     kWidthKTable,
     eStyleAnimType_None)
@@ -2378,16 +2378,25 @@ CSS_PROP_(
     overflow_clip_box_inline,
     OverflowClipBoxInline,
     CSS_PROPERTY_ENABLED_IN_UA_SHEETS,
     "layout.css.overflow-clip-box.enabled",
     VARIANT_HK,
     kOverflowClipBoxKTable,
     eStyleAnimType_Discrete)
 CSS_PROP_(
+    overflow-wrap,
+    overflow_wrap,
+    OverflowWrap,
+    0,
+    "",
+    VARIANT_HK,
+    kOverflowWrapKTable,
+    eStyleAnimType_Discrete)
+CSS_PROP_(
     overflow-x,
     overflow_x,
     OverflowX,
     0,
     "",
     VARIANT_HK,
     kOverflowSubKTable,
     eStyleAnimType_Discrete)
@@ -2396,16 +2405,40 @@ CSS_PROP_(
     overflow_y,
     OverflowY,
     0,
     "",
     VARIANT_HK,
     kOverflowSubKTable,
     eStyleAnimType_Discrete)
 CSS_PROP_SHORTHAND(
+    overscroll-behavior,
+    overscroll_behavior,
+    OverscrollBehavior,
+    CSS_PROPERTY_PARSE_FUNCTION,
+    "layout.css.overscroll-behavior.enabled")
+CSS_PROP_(
+    overscroll-behavior-x,
+    overscroll_behavior_x,
+    OverscrollBehaviorX,
+    0,
+    "layout.css.overscroll-behavior.enabled",
+    VARIANT_HK,
+    kOverscrollBehaviorKTable,
+    eStyleAnimType_Discrete)
+CSS_PROP_(
+    overscroll-behavior-y,
+    overscroll_behavior_y,
+    OverscrollBehaviorY,
+    0,
+    "layout.css.overscroll-behavior.enabled",
+    VARIANT_HK,
+    kOverscrollBehaviorKTable,
+    eStyleAnimType_Discrete)
+CSS_PROP_SHORTHAND(
     padding,
     padding,
     Padding,
     CSS_PROPERTY_PARSE_FUNCTION,
     "")
 CSS_PROP_(
     padding-block-end,
     padding_block_end,
@@ -2620,16 +2653,26 @@ CSS_PROP_(
     ruby-position,
     ruby_position,
     RubyPosition,
     0,
     "",
     VARIANT_HK,
     kRubyPositionKTable,
     eStyleAnimType_Discrete)
+CSS_PROP_(
+    scale,
+    scale,
+    Scale,
+    CSS_PROPERTY_PARSE_FUNCTION |
+        CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH,
+    "layout.css.individual-transform.enabled",
+    0,
+    nullptr,
+    eStyleAnimType_None)
 #ifndef CSS_PROP_LIST_ONLY_COMPONENTS_OF_ALL_SHORTHAND
 #ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
 CSS_PROP_(
     -moz-script-level,
     _moz_script_level,
     ScriptLevel,
     // We only allow 'script-level' when unsafe rules are enabled, because
     // otherwise it could interfere with rulenode optimizations if used in
@@ -2669,40 +2712,16 @@ CSS_PROP_(
     scroll-behavior,
     scroll_behavior,
     ScrollBehavior,
     0,
     "layout.css.scroll-behavior.property-enabled",
     VARIANT_HK,
     kScrollBehaviorKTable,
     eStyleAnimType_Discrete)
-CSS_PROP_SHORTHAND(
-    overscroll-behavior,
-    overscroll_behavior,
-    OverscrollBehavior,
-    CSS_PROPERTY_PARSE_FUNCTION,
-    "layout.css.overscroll-behavior.enabled")
-CSS_PROP_(
-    overscroll-behavior-x,
-    overscroll_behavior_x,
-    OverscrollBehaviorX,
-    0,
-    "layout.css.overscroll-behavior.enabled",
-    VARIANT_HK,
-    kOverscrollBehaviorKTable,
-    eStyleAnimType_Discrete)
-CSS_PROP_(
-    overscroll-behavior-y,
-    overscroll_behavior_y,
-    OverscrollBehaviorY,
-    0,
-    "layout.css.overscroll-behavior.enabled",
-    VARIANT_HK,
-    kOverscrollBehaviorKTable,
-    eStyleAnimType_Discrete)
 CSS_PROP_(
     scroll-snap-coordinate,
     scroll_snap_coordinate,
     ScrollSnapCoordinate,
     CSS_PROPERTY_VALUE_PARSER_FUNCTION |
         CSS_PROPERTY_VALUE_LIST_USES_COMMAS,
     "layout.css.scroll-snap.enabled",
     0,
@@ -3117,26 +3136,16 @@ CSS_PROP_(
     _webkit_text_stroke_width,
     WebkitTextStrokeWidth,
     0,
     "layout.css.prefixes.webkit",
     VARIANT_HKL | VARIANT_CALC,
     kBorderWidthKTable,
     eStyleAnimType_Discrete)
 CSS_PROP_(
-    scale,
-    scale,
-    Scale,
-    CSS_PROPERTY_PARSE_FUNCTION |
-        CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH,
-    "layout.css.individual-transform.enabled",
-    0,
-    nullptr,
-    eStyleAnimType_None)
-CSS_PROP_(
     text-transform,
     text_transform,
     TextTransform,
     0,
     "",
     VARIANT_HK,
     kTextTransformKTable,
     eStyleAnimType_Discrete)
@@ -3387,35 +3396,35 @@ CSS_PROP_(
     CSS_PROP_DOMPROP_PREFIXED(WindowDragging),
     0,
     "",
     VARIANT_HK,
     kWindowDraggingKTable,
     eStyleAnimType_Discrete)
 #ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
 CSS_PROP_(
+    -moz-window-opacity,
+    _moz_window_opacity,
+    CSS_PROP_DOMPROP_PREFIXED(WindowOpacity),
+    CSS_PROPERTY_INTERNAL | 0,
+    "",
+    VARIANT_HN,
+    nullptr,
+    eStyleAnimType_float)
+CSS_PROP_(
     -moz-window-shadow,
     _moz_window_shadow,
     CSS_PROP_DOMPROP_PREFIXED(WindowShadow),
     CSS_PROPERTY_INTERNAL |
         CSS_PROPERTY_ENABLED_IN_UA_SHEETS_AND_CHROME,
     "",
     VARIANT_HK,
     kWindowShadowKTable,
     eStyleAnimType_None)
 CSS_PROP_(
-    -moz-window-opacity,
-    _moz_window_opacity,
-    CSS_PROP_DOMPROP_PREFIXED(WindowOpacity),
-    CSS_PROPERTY_INTERNAL | 0,
-    "",
-    VARIANT_HN,
-    nullptr,
-    eStyleAnimType_float)
-CSS_PROP_(
     -moz-window-transform,
     _moz_window_transform,
     CSS_PROP_DOMPROP_PREFIXED(WindowTransform),
     CSS_PROPERTY_INTERNAL |
         CSS_PROPERTY_PARSE_FUNCTION |
         CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH,
     "",
     0,
@@ -3447,25 +3456,16 @@ CSS_PROP_(
     word_spacing,
     WordSpacing,
     0,
     "",
     VARIANT_HLP | VARIANT_NORMAL | VARIANT_CALC,
     nullptr,
     eStyleAnimType_Coord)
 CSS_PROP_(
-    overflow-wrap,
-    overflow_wrap,
-    OverflowWrap,
-    0,
-    "",
-    VARIANT_HK,
-    kOverflowWrapKTable,
-    eStyleAnimType_Discrete)
-CSS_PROP_(
     writing-mode,
     writing_mode,
     WritingMode,
     0,
     "",
     VARIANT_HK,
     kWritingModeKTable,
     eStyleAnimType_Discrete)