Merge "Fix invalid Wifi Network system crash" into klp-dev