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