Merge "GestureConverter: fix inconsistencies from clicks during gestures" into main