Merge "[Expressive design] update TopIntroPreference" into main