Pull in a couple of bug fixes. Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2616>