Merge "When configuration changed, only attach starting window to task" into main