Thanks for the rebased patch, however in GNOME:Next we run meson_test as part of check, and the rebased patch leads to tests to fail. I have for now disabled meson_test, but a patch that allows the tests to pass would have been nice :-) https://build.opensuse.org/package/show/GNOME:Next/gnome-control-center