Merge "Bump Wifi to SDK 31" into sc-dev