Merge origin/main into terry-media-adaptive-trial

Combine collapsible long-text (main) with adaptive image frame
(this branch). Resolved conflict in ImageWithTextBubble.tsx by
keeping both SingleImageFrame and CollapsibleText imports.

src/components/messageStream/bubbles/AlbumBubble.tsx

@@ -8,6 +8,7 @@ import { useLightbox } from "../overlays/ImageLightbox";
 import { autolink } from "../utils/autolink";
 import { computeAlbumLayout } from "../utils/albumLayout";
 import { postDisplayText } from "../utils/postText";
+import { CollapsibleText } from "../CollapsibleText";
 
 const MAX_VISIBLE = 4;
 
@@ -82,9 +83,12 @@ export function AlbumBubble({ post }: { post: Post }) {
         })}
       </div>
       {text ? (
-        <div className="message-stream-copyable-text select-text whitespace-pre-wrap break-words px-4 pt-3 text-[14px] leading-6 text-neutral-100">
+        <CollapsibleText
+          wrapperClassName="px-4 pt-3"
+          className="message-stream-copyable-text select-text whitespace-pre-wrap break-words text-[14px] leading-6 text-neutral-100"
+        >
           {autolink(text)}
-        </div>
+        </CollapsibleText>
       ) : null}
     </div>
   );