Merge "Revert "InputDispatcher: check consistency of filtered injected events"" into main