am d22843a8: Merge "Fix regression in ListView click handling"

* commit 'd22843a8a8d240fc09291b1b9505d62c1f0c0f8d':
  Fix regression in ListView click handling