Merge "Fixed NPE in WifiApDialog found by monkey"