Merge changes from topic "revert-16295572-ORWQJPYRMQ"

* changes:
  Revert "Input injection: Assume transformed values are in logica..."
  Revert "Remove x/y offset from MotionEntry"