Merge "Use the injected device id for events that are a11y trusted" into sc-dev