Merge "More ExpandableListView fixes to take headers into account."