These are the patches from Bastien as posted in https://gitlab.gnome.org/GNOME/gnome-control-center/issues/393#note_446643
