Merge "Add flag to show tabbed connected display settings" into main