Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091

 Conflicts:

	src/components/structures/SpaceRoomView.tsx

src/utils/MediaEventHelper.ts

@@ -67,6 +67,7 @@ export class MediaEventHelper implements IDestroyable {
     private prepareThumbnailUrl = async () => {
         if (this.media.isEncrypted) {
             const blob = await this.thumbnailBlob.value;
+            if (blob === null) return null;
             return URL.createObjectURL(blob);
         } else {
             return this.media.thumbnailHttp;