Merge "Fix NullPointerException in ListView"