Merge "Add flag check to desktop multi instance UI." into main