[gtk/gtk-3-24: 3/3] Merge branch 'overlay-scrolling-for-3' into 'gtk-3-24'

[Matthias Clasen <matthiasc src gnome org>]

commit dd25499f1e565a2b3a8e81737155c107841d0282
Merge: 3386924dbb 26b24916c8
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri May 31 19:47:00 2019 +0000

    Merge branch 'overlay-scrolling-for-3' into 'gtk-3-24'
    
    Overlay scrolling for 3
    
    See merge request GNOME/gtk!895

 gdk/wayland/gdkscreen-wayland.c |  2 +-
 gdk/x11/gdksettings.c           |  1 +
 gtk/gtkscrolledwindow.c         | 10 +++++++++-
 gtk/gtksettings.c               | 21 ++++++++++++++++++++-
 4 files changed, 31 insertions(+), 3 deletions(-)
---