am 4c38fe36: Merge "Protect against bogus input for ListViews" into jb-dev

* commit '4c38fe369fee76b8d4fca5a7b0b8d81a96f0219f':
  Protect against bogus input for ListViews