Merge "Only attach descendants if parent was detached"