Merge "Remove unused code in InputDispatcher" into main