Do not default to SecretService keyring
Merge remote-tracking branch 'chiiph/bug/more_keyring_fixes' into develop