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