Merge "wifi: fix configuration is updated failure" into sc-dev