* Support device credential (pattern/pin/password) in addition to biometric for master key (NOTE: you must re-store the master key after upgrade before you can use device credential to load them)

* Target API 34