Merge "Update input security test to include new event type" into sc-dev