Merge "ConfigWifiDisableInEcbm: add null check and change default value" into rvc-dev