Merge "Remove some old TODOs from GestureConverter.cpp" into udc-dev