Merge "Remove unused remapping code from TouchExplorer."