Merge "Make ListView's illegal state exception more helpful" into klp-dev