9aae1df7a6
This is basically 9f0e7632a6 ported over ed1170906b which was dropped this fix when copying things around. Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1655>