am 2ea9aaa2: Merge "Fix bugs 3077517 and 3309579 - ListView bugs" into honeycomb

* commit '2ea9aaa2458ca468b8f127d8c69746a009df12a6':
  Fix bugs 3077517 and 3309579 - ListView bugs