Merge "Fix off by one in ListView's upward focus traversal" into jb-mr2-dev