Revert "InputMapper refactor: Revert "fix touch issue on portrai..."

Revert submission 23779328

Reason for revert: Found touch issues on devices in latest qpr-build 

Reverted changes: /q/submissionid:23779328

Change-Id: I04301cc46cce6624ecbeee37771ee02fbeff3218
3 files changed