Merge "Fix bug 2995805 - splitMotionEvents behavior change"