Merge "Fix bugs 3077517 and 3309579 - ListView bugs" into honeycomb