Merge topic 'fix-x11' into release

0171d592 Fix X11 issues with full screen

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Mathieu Westphal <mathieu.westphal@kitware.com>
Merge-request: !6773