Merge "Refactor getPersistedNetworkPreference"