Merge "Fixes for ExpandableListView with headers/footers"