Adwaita: finally kill the scrollbar junction frame...

See https://bugzilla.gnome.org/show_bug.cgi?id=737981
Adwaita: fix the special cased sidebar scrollbar...

...which I broke with the latest commit.