Move resize after attaching Upstream-commit: c2ebdb3e573cbbb053eb4644119f3c99a6111bdc Component: engine