Merge commit 'e89acc2302df49cbd7815b031e9c2939632bd204' into glitch-soc/merge-upstream

Conflicts:
- `yarn.lock`:
  Conflict because of an extra dependency in glitch-soc.
  Updated upstream's dependencies as upstream did.

app/javascript/mastodon/features/annual_report/highlighted_post.tsx

@@ -52,7 +52,7 @@ export const HighlightedPost: React.FC<{
   );
 
   if (!status) {
-    return <div className={classNames(styles.box, styles.mostBoostedPost)} />;
+    return null;
   }
 
   let label;

app/javascript/mastodon/features/ui/components/media_modal.tsx

@@ -114,6 +114,11 @@ export const MediaModal: FC<MediaModalProps> = forwardRef<
 
     const bind = useDrag(
       ({ active, movement: [mx], direction: [xDir], cancel }) => {
+        // Disable swipe when zoomed in.
+        if (zoomedIn) {
+          return;
+        }
+
         // If dragging and swipe distance is enough, change the index.
         if (
           active &&