Merge "Removed dead code from TouchInputMapper" into main