Merge "Only provide DesktopTaskChangeListener if the flag is enabled." into main