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

* commit '4fa039dfb1a5a23dad493f3c8c2c7529ecc1e96d':
  Layout the config-changed window if it has surface