Fix tmp dir never cleanup Upstream-commit: f946a486ea3cdb56c771a37da281ad223b5042f8 Component: engine