Merge "Fix bugs in ListView"