Windows: Rename layers before deletion Upstream-commit: cb352501af9e59f10f58846d4154c76726530753 Component: engine