Merge "GestureConverter: Reset fake finger on scroll start" into main