Merge "Revert "Ignore ACTION_DOWN events when mTracking is true"" into tm-qpr-dev