Merge "Use MotionEvent.getEventTime() instead of SystemClock.uptimeMillis()" into tm-qpr-dev