Merge "Avoid unnecessarily add stub task for Desktop task" into main