Merge "Make the Connected Display flag read-only" into main