Merge "Fix ListView click handling under new focus rules"