Merge "Protect against bogus input for ListViews" into jb-dev