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