Respond to CR.

// FREEBIE

src/Security/OWSRecipientIdentity.m

@@ -4,6 +4,7 @@
 
 #import "OWSRecipientIdentity.h"
 #import "TSStorageManager.h"
+#import <YapDatabase/YapDatabaseConnection.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -91,9 +92,11 @@ NS_ASSUME_NONNULL_BEGIN
     dispatch_once(&onceToken, ^{
         sharedDBConnection = [TSStorageManager sharedManager].newDatabaseConnection;
         sharedDBConnection.objectCacheEnabled = NO;
+#if DEBUG
         sharedDBConnection.permittedTransactions = YDB_AnySyncTransaction;
+#endif
     });
-    
+
     return sharedDBConnection;
 }
 

src/Storage/TSDatabaseView.m

@@ -116,13 +116,18 @@ NSString *TSSecondaryDevicesDatabaseViewExtensionName = @"TSSecondaryDevicesData
         if ([object isKindOfClass:[TSInvalidIdentityKeyErrorMessage class]]) {
             TSInteraction *interaction = (TSInteraction *)object;
             return interaction.uniqueThreadId;
+        } else if ([object isKindOfClass:[TSErrorMessage class]]) {
+            TSErrorMessage *errorMessage = (TSErrorMessage *)object;
+            if (errorMessage.errorType == TSErrorMessageNonBlockingIdentityChange) {
+                return errorMessage.uniqueThreadId;
+            }
         }
         return nil;
     }];
 
     return [self registerMessageDatabaseViewWithName:TSSafetyNumberChangeDatabaseViewExtensionName
                                         viewGrouping:viewGrouping
-                                             version:@"1"];
+                                             version:@"2"];
 }
 
 + (BOOL)registerThreadInteractionsDatabaseView