Merge "[Expressive design] Add ZeroStatePreference" into main