Merge "base: TemporaryDir add DoNotRemove() method"