Merge change 22290 into eclair

* changes:
  Fix typo: the x offset was assigned to the y coordinate.