Merge "Fix WifiConfigStore dump crash" into sc-dev