Merge "Adds WFC roaming tests to include roaming changes" into pi-dev