Merge "Remove unused function UnmountTreeWithPrefix()"