am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView"

* commit 'b3b4f83702ca878854529acfdc389d15db5ca6f3':
  Fix NullPointerException in ListView