[Bug 225819] Merge Review: gnome-keyring