Merge "Wait for animations before injecting input event" into main