Merge "Add null check for mChannel object in WifiP2Settings"