Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev