Merge "[Expressive design] update TwoTargetPreference" into main