Merge changes I592f8c97,I2a6a87bb into main

* changes:
  Split `verifyWCTNotExecuted` into handler specific methods
  Clean up `DesktopTasksControllerTest`