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