Merge "Sync the wfc roaming logic with Settings" into qt-dev