Merge changes from topic "inputmapper-refactor-udc-dev" into udc-dev

* changes:
  InputMapper refactor: ExternalStylusInputMapper
  InputMapper refactor: TouchInputMapper