Merge "Don't send OnCompletion events when looping"