SWDEV-488851 - Correctly remove the queue from the active set on windows

Change-Id: I4d21743ecf7a44636121f85566f898e62ff61e97


[ROCm/clr commit: 07bcc283f9]

projects/clr/rocclr/platform/commandqueue.cpp

@@ -69,7 +69,6 @@ bool HostQueue::terminate() {
         // Note that if lastCommand isn't a marker, it may not be lastEnqueueCommand_ now
         // after lastCommand->awaitCompletion() is called.
         if (lastEnqueueCommand_ != nullptr) {
-          device_.removeFromActiveQueues(this);
           lastEnqueueCommand_ ->release(); // lastEnqueueCommand_ should be a marker
           lastEnqueueCommand_ = nullptr;
         }
@@ -119,6 +118,8 @@ bool HostQueue::terminate() {
     Agent::postCommandQueueFree(as_cl(this->asCommandQueue()));
   }
 
+  device_.removeFromActiveQueues(this);
+
   return true;
 }