Merge "HeaderViewListAdapter: Correct thrown error names."