Merge "Update the DesktopTaskChangeListener logic to work correctly for task management." into main