Merge "Sync the wfc roaming logic with Settings" into qt-dev
am: 3453516cb9

Change-Id: Ib8c69da8b60e13b54afbb65f74390c3f1efd42c4