Fix event listener for list view
Merge branch 'master' into 2.5