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