Move Right-click handling into UserInputHandler.
am: dbcccd65da

Change-Id: Ib28acfd62081f74d92c2a45b780f0b51763867ea