[nemo-seahorse] fixes from upstream

Most of them have been cherry-picked from upstream (seahorse-nautilus).