Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"