Refactor keyring usage and fix saving problem
Merge remote-tracking branch 'chiiph/bug/fix_keyring_save' into develop