diff --git a/dependent-usage.json b/dependent-usage.json
index 27c78f9dd2..eafaee3466 100644
--- a/dependent-usage.json
+++ b/dependent-usage.json
@@ -1,5 +1,5 @@
 {
-  "lastModified": 1719410830889,
+  "lastModified": 1719498037688,
   "projectUsages": [
     {
       "version": "22.6.1",
@@ -14638,6 +14638,12 @@
             "column": 12,
             "index": 910
           },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadModal.jsx",
+            "line": 50,
+            "column": 12,
+            "index": 1483
+          },
           {
             "filePath": "src/generic/configure-modal/AdvancedTab.jsx",
             "line": 212,
@@ -16440,6 +16446,18 @@
             "column": 22,
             "index": 3985
           },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadStatusIcon.jsx",
+            "line": 10,
+            "column": 14,
+            "index": 336
+          },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadStatusIcon.jsx",
+            "line": 12,
+            "column": 14,
+            "index": 404
+          },
           {
             "filePath": "src/files-and-videos/videos-page/VideoThumbnail.jsx",
             "line": 84,
@@ -16865,10 +16883,10 @@
             "index": 740
           },
           {
-            "filePath": "src/files-and-videos/videos-page/VideosPage.jsx",
-            "line": 234,
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadModal.jsx",
+            "line": 38,
             "column": 8,
-            "index": 6660
+            "index": 1013
           },
           {
             "filePath": "src/generic/alert-message/index.jsx",
@@ -17438,6 +17456,12 @@
             "column": 4,
             "index": 1761
           },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadModal.jsx",
+            "line": 26,
+            "column": 4,
+            "index": 611
+          },
           {
             "filePath": "src/generic/configure-modal/ConfigureModal.jsx",
             "line": 261,
@@ -17616,6 +17640,12 @@
             "column": 6,
             "index": 1929
           },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadModal.jsx",
+            "line": 34,
+            "column": 6,
+            "index": 840
+          },
           {
             "filePath": "src/generic/configure-modal/ConfigureModal.jsx",
             "line": 271,
@@ -17726,6 +17756,12 @@
             "column": 8,
             "index": 1958
           },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadModal.jsx",
+            "line": 35,
+            "column": 8,
+            "index": 869
+          },
           {
             "filePath": "src/generic/configure-modal/ConfigureModal.jsx",
             "line": 272,
@@ -17836,6 +17872,12 @@
             "column": 6,
             "index": 2097
           },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadModal.jsx",
+            "line": 66,
+            "column": 8,
+            "index": 1983
+          },
           {
             "filePath": "src/generic/configure-modal/ConfigureModal.jsx",
             "line": 287,
@@ -17928,6 +17970,12 @@
             "column": 6,
             "index": 4851
           },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadModal.jsx",
+            "line": 70,
+            "column": 6,
+            "index": 2129
+          },
           {
             "filePath": "src/generic/configure-modal/ConfigureModal.jsx",
             "line": 292,
@@ -18152,11 +18200,17 @@
             "column": 12,
             "index": 2074
           },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadModal.jsx",
+            "line": 71,
+            "column": 8,
+            "index": 2158
+          },
           {
             "filePath": "src/files-and-videos/videos-page/VideosPage.jsx",
-            "line": 239,
+            "line": 245,
             "column": 8,
-            "index": 7044
+            "index": 7172
           },
           {
             "filePath": "src/generic/configure-modal/ConfigureModal.jsx",
@@ -19258,11 +19312,17 @@
             "column": 8,
             "index": 4726
           },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadModal.jsx",
+            "line": 72,
+            "column": 10,
+            "index": 2180
+          },
           {
             "filePath": "src/files-and-videos/videos-page/VideosPage.jsx",
-            "line": 245,
+            "line": 251,
             "column": 12,
-            "index": 7242
+            "index": 7370
           },
           {
             "filePath": "src/files-and-videos/videos-page/VideoThumbnail.jsx",
@@ -20004,6 +20064,18 @@
             "column": 6,
             "index": 811
           },
+          {
+            "filePath": "src/files-and-videos/generic/EditFileErrors.jsx",
+            "line": 32,
+            "column": 6,
+            "index": 988
+          },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadModal.jsx",
+            "line": 42,
+            "column": 10,
+            "index": 1099
+          },
           {
             "filePath": "src/generic/alert-message/index.jsx",
             "line": 7,
@@ -20300,6 +20372,12 @@
             "column": 4,
             "index": 3889
           },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadProgressList.jsx",
+            "line": 12,
+            "column": 8,
+            "index": 449
+          },
           {
             "filePath": "src/generic/clipboard/paste-component/components/PopoverContent.jsx",
             "line": 22,
@@ -20630,9 +20708,9 @@
           },
           {
             "filePath": "src/files-and-videos/videos-page/VideosPage.jsx",
-            "line": 225,
+            "line": 236,
             "column": 6,
-            "index": 6316
+            "index": 6828
           },
           {
             "filePath": "src/grading-settings/GradingSettings.jsx",
@@ -21508,9 +21586,15 @@
           },
           {
             "filePath": "src/files-and-videos/videos-page/VideosPage.jsx",
-            "line": 60,
+            "line": 61,
             "column": 6,
-            "index": 1523
+            "index": 1604
+          },
+          {
+            "filePath": "src/files-and-videos/videos-page/VideosPage.jsx",
+            "line": 66,
+            "column": 6,
+            "index": 1710
           },
           {
             "filePath": "src/group-configurations/content-groups-section/ContentGroupCard.jsx",
@@ -22308,9 +22392,9 @@
           },
           {
             "filePath": "src/files-and-videos/videos-page/VideosPage.jsx",
-            "line": 243,
+            "line": 249,
             "column": 10,
-            "index": 7169
+            "index": 7297
           },
           {
             "filePath": "src/schedule-and-details/license-section/license-commons-options/index.jsx",
@@ -23182,12 +23266,6 @@
             "column": 8,
             "index": 1487
           },
-          {
-            "filePath": "src/files-and-videos/videos-page/VideosPage.jsx",
-            "line": 235,
-            "column": 53,
-            "index": 6791
-          },
           {
             "filePath": "src/generic/Loading.jsx",
             "line": 7,
@@ -23960,6 +24038,12 @@
             "column": 10,
             "index": 2136
           },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadProgressList.jsx",
+            "line": 15,
+            "column": 12,
+            "index": 625
+          },
           {
             "filePath": "src/group-configurations/common/TitleButton.jsx",
             "line": 30,
@@ -24958,6 +25042,12 @@
             "column": 33,
             "index": 3608
           },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadStatusIcon.jsx",
+            "line": 10,
+            "column": 25,
+            "index": 347
+          },
           {
             "filePath": "src/pages-and-resources/discussions/app-list/FeaturesTable.jsx",
             "line": 36,
@@ -25169,6 +25259,12 @@
             "line": 43,
             "column": 15,
             "index": 1316
+          },
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadStatusIcon.jsx",
+            "line": 12,
+            "column": 25,
+            "index": 415
           }
         ],
         "ExpandMore": [
@@ -25301,6 +25397,30 @@
             "index": 3996
           }
         ],
+        "WarningFilled": [
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadModal.jsx",
+            "line": 40,
+            "column": 16,
+            "index": 1064
+          }
+        ],
+        "Scrollable": [
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadModal.jsx",
+            "line": 65,
+            "column": 6,
+            "index": 1962
+          }
+        ],
+        "ProgressBar": [
+          {
+            "filePath": "src/files-and-videos/videos-page/upload-modal/UploadProgressList.jsx",
+            "line": 25,
+            "column": 14,
+            "index": 974
+          }
+        ],
         "VideoFile": [
           {
             "filePath": "src/files-and-videos/videos-page/VideoThumbnail.jsx",
@@ -47311,9 +47431,9 @@
           },
           {
             "filePath": "src/editors/containers/TextEditor/index.jsx",
-            "line": 71,
+            "line": 67,
             "column": 8,
-            "index": 1842
+            "index": 1679
           }
         ],
         "ModalDialog.Footer": [
@@ -47345,9 +47465,9 @@
           },
           {
             "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/index.jsx",
-            "line": 61,
+            "line": 63,
             "column": 10,
-            "index": 1876
+            "index": 1902
           },
           {
             "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GroupFeedback/GroupFeedbackRow.jsx",
@@ -47465,9 +47585,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 34,
+            "line": 33,
             "column": 4,
-            "index": 716
+            "index": 715
           },
           {
             "filePath": "src/editors/sharedComponents/TypeaheadDropdown/index.jsx",
@@ -47649,15 +47769,15 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 59,
+            "line": 58,
             "column": 23,
-            "index": 1447
+            "index": 1446
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 99,
+            "line": 98,
             "column": 10,
-            "index": 2761
+            "index": 2760
           },
           {
             "filePath": "src/editors/sharedComponents/TypeaheadDropdown/index.jsx",
@@ -47687,15 +47807,15 @@
           },
           {
             "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/index.jsx",
-            "line": 62,
+            "line": 64,
             "column": 12,
-            "index": 1900
+            "index": 1926
           },
           {
             "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/index.jsx",
-            "line": 65,
+            "line": 67,
             "column": 12,
-            "index": 2077
+            "index": 2103
           },
           {
             "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/index.jsx",
@@ -47843,15 +47963,15 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/index.jsx",
-            "line": 64,
+            "line": 63,
             "column": 8,
-            "index": 1358
+            "index": 1357
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/index.jsx",
-            "line": 72,
+            "line": 71,
             "column": 8,
-            "index": 1595
+            "index": 1594
           },
           {
             "filePath": "src/editors/sharedComponents/SourceCodeModal/index.jsx",
@@ -47881,15 +48001,15 @@
           },
           {
             "filePath": "src/editors/containers/ProblemEditor/index.jsx",
-            "line": 32,
+            "line": 34,
             "column": 8,
-            "index": 962
+            "index": 1120
           },
           {
             "filePath": "src/editors/containers/TextEditor/index.jsx",
-            "line": 78,
+            "line": 74,
             "column": 14,
-            "index": 2083
+            "index": 1921
           },
           {
             "filePath": "src/editors/containers/VideoEditor/index.jsx",
@@ -47905,9 +48025,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/Gallery.jsx",
-            "line": 42,
+            "line": 37,
             "column": 8,
-            "index": 948
+            "index": 820
           },
           {
             "filePath": "src/example.jsx",
@@ -48051,9 +48171,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 35,
+            "line": 34,
             "column": 6,
-            "index": 734
+            "index": 733
           },
           {
             "filePath": "src/editors/sharedComponents/TypeaheadDropdown/FormGroup.jsx",
@@ -48209,9 +48329,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 36,
+            "line": 35,
             "column": 8,
-            "index": 777
+            "index": 776
           },
           {
             "filePath": "src/editors/sharedComponents/TypeaheadDropdown/FormGroup.jsx",
@@ -48589,29 +48709,17 @@
             "column": 16,
             "index": 1868
           },
-          {
-            "filePath": "src/editors/sharedComponents/SelectionModal/GalleryLoadMoreButton.jsx",
-            "line": 25,
-            "column": 15,
-            "index": 670
-          },
-          {
-            "filePath": "src/editors/sharedComponents/SelectionModal/GalleryLoadMoreButton.jsx",
-            "line": 26,
-            "column": 15,
-            "index": 712
-          },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 45,
+            "line": 44,
             "column": 26,
-            "index": 1108
+            "index": 1107
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 53,
+            "line": 52,
             "column": 16,
-            "index": 1327
+            "index": 1326
           },
           {
             "filePath": "src/editors/sharedComponents/TypeaheadDropdown/index.jsx",
@@ -48659,9 +48767,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 50,
+            "line": 49,
             "column": 23,
-            "index": 1269
+            "index": 1268
           }
         ],
         "Truncate": [
@@ -48670,12 +48778,6 @@
             "line": 52,
             "column": 6,
             "index": 1334
-          },
-          {
-            "filePath": "src/editors/sharedComponents/SelectionModal/GalleryCard.jsx",
-            "line": 69,
-            "column": 12,
-            "index": 2324
           }
         ],
         "IconButton": [
@@ -48777,9 +48879,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 43,
+            "line": 42,
             "column": 16,
-            "index": 1005
+            "index": 1004
           },
           {
             "filePath": "src/editors/sharedComponents/TypeaheadDropdown/index.jsx",
@@ -49035,9 +49137,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 78,
+            "line": 77,
             "column": 6,
-            "index": 2106
+            "index": 2105
           }
         ],
         "Dropdown.Toggle": [
@@ -49067,9 +49169,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 79,
+            "line": 78,
             "column": 8,
-            "index": 2125
+            "index": 2124
           }
         ],
         "Add": [
@@ -49099,9 +49201,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/index.jsx",
-            "line": 74,
+            "line": 73,
             "column": 22,
-            "index": 1664
+            "index": 1663
           },
           {
             "filePath": "src/editors/sharedComponents/TypeaheadDropdown/index.jsx",
@@ -49137,9 +49239,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 87,
+            "line": 86,
             "column": 8,
-            "index": 2390
+            "index": 2389
           }
         ],
         "Dropdown.Item": [
@@ -49211,9 +49313,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 89,
+            "line": 88,
             "column": 12,
-            "index": 2466
+            "index": 2465
           }
         ],
         "Form.Label": [
@@ -49281,17 +49383,17 @@
         "AlertModal": [
           {
             "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/index.jsx",
-            "line": 54,
+            "line": 56,
             "column": 6,
-            "index": 1589
+            "index": 1615
           }
         ],
         "Container": [
           {
             "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/index.jsx",
-            "line": 99,
+            "line": 102,
             "column": 10,
-            "index": 3197
+            "index": 3249
           },
           {
             "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/HintRow.jsx",
@@ -49675,9 +49777,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/GalleryCard.jsx",
-            "line": 42,
+            "line": 41,
             "column": 12,
-            "index": 1320
+            "index": 1308
           }
         ],
         "Stack": [
@@ -49749,9 +49851,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/index.jsx",
-            "line": 97,
+            "line": 96,
             "column": 6,
-            "index": 2318
+            "index": 2317
           }
         ],
         "ModalDialog.Title": [
@@ -49801,12 +49903,6 @@
             "column": 76,
             "index": 1537
           },
-          {
-            "filePath": "src/editors/sharedComponents/SelectionModal/GalleryLoadMoreButton.jsx",
-            "line": 25,
-            "column": 26,
-            "index": 681
-          },
           {
             "filePath": "src/editors/sharedComponents/TypeaheadDropdown/index.jsx",
             "line": 161,
@@ -50197,71 +50293,55 @@
         "Badge": [
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/GalleryCard.jsx",
-            "line": 49,
+            "line": 48,
             "column": 12,
-            "index": 1621
+            "index": 1609
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/GalleryCard.jsx",
-            "line": 54,
+            "line": 53,
             "column": 12,
-            "index": 1865
-          }
-        ],
-        "SpinnerSimple": [
-          {
-            "filePath": "src/editors/sharedComponents/SelectionModal/GalleryLoadMoreButton.jsx",
-            "line": 26,
-            "column": 26,
-            "index": 723
-          }
-        ],
-        "StatefulButton": [
-          {
-            "filePath": "src/editors/sharedComponents/SelectionModal/GalleryLoadMoreButton.jsx",
-            "line": 35,
-            "column": 8,
-            "index": 952
+            "index": 1853
           }
         ],
         "Search": [
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 53,
+            "line": 52,
             "column": 27,
-            "index": 1338
+            "index": 1337
           }
         ],
         "SelectMenu": [
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 60,
+            "line": 59,
             "column": 6,
-            "index": 1476
+            "index": 1475
           }
         ],
         "MenuItem": [
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 62,
+            "line": 61,
             "column": 10,
-            "index": 1587
+            "index": 1586
           }
         ],
         "Form.SwitchSet": [
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 100,
+            "line": 99,
             "column": 10,
-            "index": 2792
+            "index": 2791
           }
         ],
         "Form.Switch": [
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 105,
+            "line": 104,
             "column": 12,
-            "index": 2916
+            "index": 2915
           }
         ],
         "useWindowSize": [
@@ -51202,9 +51282,9 @@
           },
           {
             "filePath": "src/packages/home-page/components/MarketingTakeoverV2/index.jsx",
-            "line": 20,
+            "line": 22,
             "column": 6,
-            "index": 655
+            "index": 709
           },
           {
             "filePath": "src/packages/home-page/components/NewOnEdxCarousel/index.jsx",