Merge "Clean up InputDispatcher debugging."