Use single click for primary action, right click for context menu

Change-Id: Ia707a88b48f4af144588c45d37acea547e77773e