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