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