Merge "Allow adding headers and footers to ListView after setAdapter()."