Merge "Catch NullPointer caused by race of setting mWifiCond" into main