Replace direct `KeyStore.add` calls

[rrrooommmaaa]

Yes, we should consider doing that in a separate task, and also renaming that method. If it does that, it's not too appropriately named. Maybe savePrvAndPubKeysAndPassPhrases

Originally posted by @tomholub in #4646 (comment)

Also, refactoring may involve #4545