Merge "Refactor PreferredNetworkModePreference"