Merge "Added X11 window manager resize handling" into devel/master