Merge "Fix regression in ListView click handling"