Merge proposals dependent on lp://staging/~mrpouit/xscreensaver/restore-vanished-changes

lp://staging/~mrpouit/xscreensaver/restore-vanished-changes has no merge proposals.