Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev