Merge "Add some logging code to track down touch issues."