Merge "Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c4 am: ae3ad247" into rvc-d1-dev-plus-aosp