Merge commit 'c5f1b92d0a480f3119be8ea6eebbada402c17cf3' * commit 'c5f1b92d0a480f3119be8ea6eebbada402c17cf3': Fixes 1819406. Take a ListView, add headers/footers, set the adapter after at least one layout pass, and the headers/footers don't know they have a parent anymore. Which causes a lot of trouble, like drawing not happening.