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

Change-Id: Iffb3e3c70d9d135f15f66f3bf7968dfef9f1d4f5