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

* commit '3e305491cc24669305e22875c1fea337faed0b2c':
  Layout the window to be displayed if it would be resized