Merge "InputDispatcher: Check for normal connection for consistency" into main