Fixes issue with changing local passcode; disables passcode option for ephemeral sessions.

app/assets/javascripts/app/directives/views/accountMenu.js

@@ -26,6 +26,8 @@ class AccountMenu {
       return authManager.user || passcodeManager.hasPasscode();
     }
 
+    $scope.canAddPasscode = !authManager.isEphemeralSession();
+
     $scope.syncStatus = syncManager.syncStatus;
     $scope.newPasswordData = {};
 

app/assets/javascripts/app/services/storageManager.js

@@ -73,7 +73,10 @@ class StorageManager {
       }
 
       this.itemsStorageMode = mode;
-      this.storage.clear();
+      if(newStorage !== this.storage) {
+        // Only clear if this.storage isn't the same reference as newStorage
+        this.storage.clear();
+      }
       this.storage = newStorage;
 
       if(mode == StorageManager.FixedEncrypted) {