Merge "WifiDiagnostics handle multiple clientmode" into sc-dev