Merge change 20567

* changes:
  Start rewriting the motion event tracking.