Merge "Do not rely on roaming when setting WFC roaming setting"