Merge "multiple-desktops: Add aconfig flag" into main