Merge "[DO NOT MERGE] Fix some mouse + list-item selection/scrolling issues" am: 8b764a0d -s ours am: d418ecfc -s ours Change-Id: I7d45de823c87f346b25ad0194dc538b560d67bad