Merge branch 'charlesmchen/crashOnLaunch' into hotfix/2.13.3.0

Signal/src/environment/Migrations/OWSDatabaseMigrationRunner.m

@@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
         [[OWS100RemoveTSRecipientsMigration alloc] initWithStorageManager:self.storageManager],
         [[OWS102MoveLoggingPreferenceToUserDefaults alloc] initWithStorageManager:self.storageManager],
         [[OWS103EnableVideoCalling alloc] initWithStorageManager:self.storageManager],
-        [[OWS104CreateRecipientIdentities alloc] initWithStorageManager:self.storageManager],
+        // OWS104CreateRecipientIdentities is run separately. See runSafeBlockingMigrations.
         [[OWS105AttachmentFilePaths alloc] initWithStorageManager:self.storageManager]
     ];
 }
@@ -46,6 +46,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)runSafeBlockingMigrations
 {
+    // This should only include migrations which:
+    //
+    // a) Do read/write database transactions and therefore would block on the async database
+    //    view registration.
+    // b) Will not affect any of the data used by the async database views.
     [self runMigrations:@[
         [[OWS104CreateRecipientIdentities alloc] initWithStorageManager:self.storageManager],
     ]];