Merge "[DO NOT MERGE] Fix some mouse + list-item selection/scrolling issues"