Use a simplified keyring launch

This depends on gnome-keyring-daemon learning the new --unlock
option, which will hopefully happen soon.