Merge "Merge "Revert "Call preserveSurfaces when detaching children."" into rvc-dev am: 3affbe4d am: 37873794 am: 0e030685" into rvc-qpr-dev-plus-aosp