Merge remote-tracking branch 'origin/main' into subs/base

* origin/main:
  Revert "[Video] Revert safari hackfix (#5367)" (#7001)
  Fix squashed content on mod screens (#7004)
  [ELI5] Change feed page     copy (#6932)
  Immediately parse pre-filled links in composer state (#6974)
  Add useFormatCurrency hook (#6978)
  Update view shot (#6995)
  Remove icon (#6994)
  clean rn 0.76 upgrade (#6887)
  Trim back prefs exposure in NUXs, make naming more friendly (#6980)
  [Layout] Base (#6907)
  Add some icons (#6976)

bskyweb/templates/base.html

@@ -40,7 +40,6 @@
     }
     html {
       background-color: white;
-      scrollbar-gutter: stable both-edges;
     }
     @media (prefers-color-scheme: dark) {
       html {
@@ -76,9 +75,15 @@
       top: 50%;
       transform: translateX(-50%) translateY(-50%) translateY(-50px);
     }
-    /* We need this style to prevent web dropdowns from shifting the display when opening */
+    /**
+     * We need these styles to prevent shifting due to scrollbar show/hide on
+     * OSs that have them enabled by default. This also handles cases where the
+     * screen wouldn't otherwise scroll, and therefore hide the scrollbar and
+     * shift the content, by forcing the page to show a scrollbar.
+     */
     body {
       width: 100%;
+      overflow-y: scroll;
     }
   </style>