Merge "wifi: fix FILS network detection" into sc-dev