[gnome-settings-daemon-ubuntu] Rebase on gnome3-staging PPA sources