[FIX] keychain: unlock duration not properly set
Merge pull request #1315 from shekenahglory/develop

[FIX] keychain: unlock duration not properly set