Merge "Fix an event injection bug when the policy is bypassed."