Merge "Sync the wfc roaming logic with Settings"