Merge "Add the outline back for off switches." into main