Merge "Move methods from TouchCursorInputMapperCommon.h into a cpp file"