Merge "Merge "Call preserveSurfaces when detaching children." into rvc-dev am: 5b72ddd8 am: 0be99525 am: ef62ca2f" into rvc-qpr-dev-plus-aosp