Don't change order of active context

Author: Hugh Delaney

source/adapters/cuda/enqueue.cpp

@@ -644,12 +644,11 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueMemBufferReadRect(
                                        &hBuffer->LastEventWritingToMemObj));
     }
 
+    ScopedContext Active(Device);
+
     UR_CHECK_ERROR(enqueueEventsWait(hQueue, Stream, numEventsInWaitList,
                                      phEventWaitList));
 
-    // enqueueEventsWait may set a context so we need to reset it here
-    ScopedContext Active(Device);
-
     if (phEvent) {
       RetImplEvent =
           std::unique_ptr<ur_event_handle_t_>(ur_event_handle_t_::makeNative(
@@ -1655,12 +1654,11 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueMemBufferRead(
                                        &hBuffer->LastEventWritingToMemObj));
     }
 
+    ScopedContext Active(Device);
+
     UR_CHECK_ERROR(enqueueEventsWait(hQueue, Stream, numEventsInWaitList,
                                      phEventWaitList));
 
-    // enqueueEventsWait may set a context so we need to reset it here
-    ScopedContext Active(Device);
-
     if (phEvent) {
       RetImplEvent =
           std::unique_ptr<ur_event_handle_t_>(ur_event_handle_t_::makeNative(