Merge "Warn when other's child is added to ListView as header/footer." into oc-dev
am: a9a916ada7

Change-Id: I9092f414ebd888925b6a4522d3e2afe3d47892f6