Merge "Fix an NPE in WifiP2pSettings UI"