Simplify dir removal in overlay driver Upstream-commit: 6654b0e05f663da394bac6ed846187bca90451f5 Component: engine