Merge "Remove unused function from TouchState"