Merge "Fix how HapticScrollFeedbackProvider resets input/motion states" into main