Optimizations for recursive unmount Upstream-commit: 59e86068e6b2c23f083bd30b9987fea3fe90ba18 Component: engine