Bug 51647: Allow right clicking on nearby

Change-Id: I3b9c803ca51ff26e631dbdb15f859d3cdc33fd80
Merge "Bug 51647: Allow right clicking on nearby"