Merge "Create desktop windowing persistence flag." into main