Avoid expensively re-encrypting the Key on Login with Login File

[danimoh]

If the key is already encrypted in the Login File with the latest encryption version, take the encrypted key from there, instead of expensively re-encrypting the Key (involving a pbkdf2 password derivation) on storage to the KeyStore on login.