Merge "Allow IllustrationPreference usage in PermissionController"