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

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