Merge "Create aconfig flag for desktop windowing" into main