Merge "Refactor resampler logic to constrain MotionEvent mutation" into main