Merge "Remove waitpid on UnMount"