Adwaita: backport osd style changes from 3.15