Merge "Only detach children from a different client than parent."