Merge "Rename functions in InputDispatcher"