Merge "InputMapper refactor: TouchpadInputMapper" into udc-dev