Merge "Fix memory leak of DataSaverPreference"