Merge "Handling case when touchpad gesture is in progress" into main