Listview: some refactoring
Merge pull request #374 from kyuri/upstream

Listview: some refactoring