Merge "Layout the config-changed window if it has surface"