Merge "[Expressive design] Update padding for some widgets" into main