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

* commit '9079259054359e45b9616afaa799439c9171c0e2':
  Layout the config-changed window if it has surface