Merge "Fix bug 6048643 - verify ListView layoutparams while tracking stable IDs"