am d54529c4: am 23819e7e: Merge "Make ListView\'s illegal state exception more helpful" into klp-dev

* commit 'd54529c43545faa10cac4e34e9b8d623de121e2e':
  Make ListView's illegal state exception more helpful