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

* commit '19623538735fac497325e2082a0ba56c199fc6b1':
  Fix NullPointerException in ListView