Fix joystick and trackpad regression.

Change-Id: I33b6756f95a6b0725ffa210f341da3c98426491b
2 files changed