Merge "Merge "Revert "Call preserveSurfaces when detaching children."" into rvc-dev am: 3affbe4d am: c3e5f831 am: 564f07ab" into rvc-qpr-dev-plus-aosp