Merge "Call preserveSurfaces when detaching children." into rvc-dev