Merge "Fix WifiManager NPEs in CryptKeeper UI."