housekeeping: Cherry pick some fixes from gnome-settings-daemon