Merge "[expressive design] Update dropdown layout." into main