Merge "InputMapper refactor: TouchpadInputMapper"