Merge "[expressive design] Update Switch appearance." into main