
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/587 (cherry picked from commit c67460a1e3b9103cbcd1adf175c03f2cbc37b4a2)
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/587 (cherry picked from commit c67460a1e3b9103cbcd1adf175c03f2cbc37b4a2)