Merge change 4539 into donut

* changes:
  Fixes #1925003. Make ListView honor the android:choiceMode XML attribute.