am 000293c9: Merge "Layout the window to be displayed if it would be resized"

* commit '000293c93b41f69857f228d085b6f44b9afa34b0':
  Layout the window to be displayed if it would be resized