Merge "Disable waiting for animation from event injection" into sc-dev