Merge "Fix handling of ListPreference.setValue()"