Merge proposals dependent on lp://staging/~gilir/xscreensaver/fix-129769

lp://staging/~gilir/xscreensaver/fix-129769 has no merge proposals.