Pass in non/blockingApproval args to saveIdentity

Multiple cases here:
1. setting our own key on registration
1. changing identities from a safety number change dialog

Note that removeIdentityKey runs before saveIdentity, so we'll always end up
with firstUse: true on our own key.

// FREEBIE

js/models/conversations.js

@@ -504,7 +504,7 @@
             throw 'No conflicts to resolve';
         }
 
-        return textsecure.storage.protocol.saveIdentity(number, identityKey).then(function() {
+        return textsecure.storage.protocol.saveIdentity(number, identityKey, true, true).then(function() {
             var promise = Promise.resolve();
             var conflicts = this.messageCollection.filter(function(message) {
                 return message.hasKeyConflict(number);