Merge "Improve preferences for PreferenceDataStore."