am 8c9283f4: Merge "Fix NullPointerException in ListView"

* commit '8c9283f41083a20a82ae37eac44b79de6eb3158e':
  Fix NullPointerException in ListView