This kills X11 warnings for Ubuntu/Gnome.
(cherry picked from commit 2eb55c6d8e2c2932a9703070fddabca6a18633e0)