Merge "Add extra conditions to test HeaderListViewAdapter isEmpty"