Merge "Use aconfig flag for desktop mode" into main