Merge "Fix warnings in DesktopTasksController" into main