Merge "Fix Wifi NPE on shutdown"