Merge "Fix the SetConnectivityStatus callback"