The fix is included upstream in modified form as https://git.gnome.org/browse/mutter/commit/?id=3137ddb1a1071407f557a181121695e37e5faf3d. I have not tested this exact patch, but it should work.
This bug will be fixed by mutter 3.22.0, which seems to have just been tagged upstream. -- Andrew Chadwick
