Merge "[DO NOT MERGE] Fix some mouse + list-item selection/scrolling issues" am: 8b764a0dab  -s ours am: d418ecfc66  -s ours
am: 0df5ca72d6  -s ours

Change-Id: Id7a9148a0b1d9298a51388a4d505e18860384915