Merge changes from topic "drawing-tablet" into udc-dev

* changes:
  Fix display association for drawing tablets
  TouchInputMapper: Use a fixed scale factor for external drawing tablets