The first way I had it produces somewhat unexpected behavior. If you scroll past the top of the list, focus moves down to the control below. This changes it so scrolling past the bottom of the list moves focus to the next control below. Change-Id: I886e1854df85ceb203dac61c7f8c7daf6749e90e