Merge "Add quick switch flag for desktop windowing cases." into main