Merge "GestureConverter: remove an old TODO" into main