Merge changes from topic "revert-23316821-WWTNIVUOBO" into udc-dev

* changes:
  Revert "InputMapper refactor: Configure empty InputDevice"
  Revert "InputMapper refactor: Revert "fix touch issue on portrai..."