Merge "Wait for window animations to complete before injecting input for test"