StickyListHeadersListView: merged fixes from original repository