Backport upstream patch to fix gnome-shell crashes. Release 2