Merge "fix race condition in OperationScheduler"