Merge "Fix one race condition between start and stop."