Revert "Revert "Move TouchPoint to Devel API""