Merge "Null pointer tests removed from HeaderViewListAdapter."