Tree item fails with ItemClickListener (#14388)

Fixes after review. Tests were simplified.

Change-Id: I5c631d44fd742fee36f01aeb2044b85faf709d23