[BREAKING CHANGE] Make all focusable nodes clickable

In practice anything with a primary command is also
clickable, so just merge the code.

Change-Id: I629d3da8d15ff1e70feadea01fac2a7a3f4748f5
Merge "[BREAKING CHANGE] Make all focusable nodes clickable"