MESSENGER-2762 Initial Merge

Riot/Modules/SetPinCode/SetPinCoordinator.swift

@@ -2,6 +2,7 @@
 // $ createRootCoordinator.sh SetPinCode SetPin EnterPinCode
 /*
  Copyright 2020 New Vector Ltd
+ Copyright (c) 2021 BWI GmbH
  
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -124,7 +125,7 @@ final class SetPinCoordinator: SetPinCoordinatorType {
     }
     
     private func removeBiometrics() {
-        pinCodePreferences.biometricsEnabled = nil
+        pinCodePreferences.biometricsEnabled = false
     }
 }
 
@@ -147,7 +148,6 @@ extension SetPinCoordinator: EnterPinCodeCoordinatorDelegate {
         storePin(pin)
         if pinCodePreferences.forcePinProtection && pinCodePreferences.isBiometricsAvailable && !pinCodePreferences.isBiometricsSet {
             viewMode = .setupBiometricsAfterLogin
-            setRootCoordinator(createSetupBiometricsCoordinator())
         } else {
             self.delegate?.setPinCoordinatorDidComplete(self)
         }