Merge "[Expressive design] some widgets should not be round corner" into main