[FIX] keychain: reset password timeout to 5 minutes
[FIX] 2FA: correctly populate country code from authy dropdown
Merge pull request #1447 from shekenahglory/release

2FA: correctly populate country code from authy dropdown