Merge changes I209e3ec7,If70df129 into main

* changes:
  Change collapse to use adapterItems instead of getting the childCount()
  Upon expanding, expand just enough so the header shows.