Fixes to get merge with master to work. Does not update image of window correctly.
Fixes to get merge with master to work. Does not update image of window correctly.

TeamEuclid/euclid,TeamEuclid/euclid,freedesktop-unofficial-mirror/xorg__lib__libxcwm,freedesktop-unofficial-mirror/xorg__lib__libxcwm