am 04963769: Merge "Track motion events before we decide to start scrolling"

* commit '04963769e36a389f96a25712dd0bd0de570b4df8':
  Track motion events before we decide to start scrolling