am 796a1773: am 4fa039df: Merge "Layout the config-changed window if it has surface"

* commit '796a1773070fd13eca07bc4919f1c7cdf2d8a8e7':
  Layout the config-changed window if it has surface