Merge "Revert "Reject inconsistent globally injected events"" into main