Merge changes I1268101d,Id40470f6

* changes:
  Handle adjustResize flag properly on client
  Reparent IME window and handle non-fullscreen windows correctly