Merge "Un-hide string set persistence methods in Preference" into nyc-dev