Merge "Ensure partially-detached AbsListView children are removed" into mnc-dev