Merge "wifi: fix incorrect security params updating codes" into sc-dev