Merge "Improve the features of IllustrationPreference." into sc-dev